[oe-commits] org.oe.dev merge of '12863abb0b7e2930410ef9d63a38c9cebf57361b'

[crofton commit]

merge of '12863abb0b7e2930410ef9d63a38c9cebf57361b'
     and 'cf37c9ac56f92be7950c19ff0574c6099086b9e6'

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 60b18c9d139a4e316baa1ec3f7a4fb046c1cab37
ViewMTN: http://monotone.openembedded.org/revision/info/60b18c9d139a4e316baa1ec3f7a4fb046c1cab37
Files:
1
packages/dsplink
packages/dsplink/dsplink_1.50.bb
packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch
packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch
packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch
packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch
packages/linux/linux-omap2_git.bb
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/linux/linux_2.6.25.bb
Diffs:

#
# mt diff -r12863abb0b7e2930410ef9d63a38c9cebf57361b -r60b18c9d139a4e316baa1ec3f7a4fb046c1cab37
#
#
#
# add_dir "packages/dsplink"
# 
# add_file "packages/dsplink/dsplink_1.50.bb"
#  content [211ed123063926f84e293bc2ec6e7239aaeda2bf]
#
============================================================
--- packages/dsplink/dsplink_1.50.bb	211ed123063926f84e293bc2ec6e7239aaeda2bf
+++ packages/dsplink/dsplink_1.50.bb	211ed123063926f84e293bc2ec6e7239aaeda2bf
@@ -0,0 +1,17 @@
+DESCRIPTION = "DSP Link for TI ARM/DSP processors"
+
+PR = "r0"
+
+# Get dsplink tarball from TI website, place in sources and calculate
+# md5sum
+SRC_URI ="http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
+"
+
+S = "${WORKDIR}/dsplink_1_50"
+
+do_configure () {
+}
+
+do_compile () {
+}
+


#
# mt diff -rcf37c9ac56f92be7950c19ff0574c6099086b9e6 -r60b18c9d139a4e316baa1ec3f7a4fb046c1cab37
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch"
# 
# delete "packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch"
# 
# delete "packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch"
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch"
#  content [600d062218a1b4266905f44c26ab670c0c53f7a4]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [8e7d4cb4e84b3d94fa459bf62dd4892ff2e7ae9f]
#    to [ff28a88cc78eaf1d0a39ca0bedaa3aeb4c0f30fb]
# 
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
#  from [801134850169bd093cb2c9401f2e93bbd3acc903]
#    to [9e64614b2b4500887ff09f7ff53ffccb90a7ff0a]
# 
# patch "packages/linux/linux_2.6.25.bb"
#  from [ed037c79f846e5b7c53db483560819488aadcdcf]
#    to [908bd7f32af38ac35b5fed1ed57e60c950bcb8c9]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch	600d062218a1b4266905f44c26ab670c0c53f7a4
+++ packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch	600d062218a1b4266905f44c26ab670c0c53f7a4
@@ -0,0 +1,36 @@
+From eddf57fb9748791e021ef550d651cc72c48add5c Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen at openembedded.org>
+Date: Thu, 15 May 2008 09:32:23 +0200
+Subject: [PATCH] ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
+
+This patch fixes the merge-damage in the beagleboard RTC code
+
+Signed-off-by: Koen Kooi <koen at openembedded.org>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 0c15ca0..0c0cbfc 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -76,6 +76,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
+ 
+ static void __init omap3_beagle_init(void)
+ {
++	platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
+ 	omap_board_config = omap3_beagle_config;
+ 	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
+ 	omap_serial_init();
+@@ -88,8 +89,6 @@ arch_initcall(omap3_beagle_i2c_init);
+ 
+ static void __init omap3_beagle_map_io(void)
+ {
+-	platform_add_devices(omap3_beagle_devices,
+-				ARRAY_SIZE(omap3_beagle_devices));
+ 	omap2_set_globals_343x();
+ 	omap2_map_common_io();
+ }
+-- 
+1.5.4.3
+
============================================================
--- packages/linux/linux-omap2_git.bb	8e7d4cb4e84b3d94fa459bf62dd4892ff2e7ae9f
+++ packages/linux/linux-omap2_git.bb	ff28a88cc78eaf1d0a39ca0bedaa3aeb4c0f30fb
@@ -5,7 +5,7 @@ PV = "2.6.25+2.6.26-rc2+git${SRCREV}"
 SRCREV = "74c89552b4a5f9b5b066f74fa265248f9b5d3f1d"
 
 PV = "2.6.25+2.6.26-rc2+git${SRCREV}"
-PR = "r12"
+PR = "r13"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
@@ -13,7 +13,8 @@ SRC_URI_append_beagleboard = " file://no
 
 SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
 			       file://usb-timout.patch;patch=1 \
-			       file://l2-cache.patch;patch=1 \ 	
+			       file://l2-cache.patch;patch=1 \
+			       file://0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch;patch=1 \ 	
 			       file://0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch;patch=1 \
 "
 
============================================================
--- packages/linux/linux_2.6.23+2.6.24-rc5.bb	801134850169bd093cb2c9401f2e93bbd3acc903
+++ packages/linux/linux_2.6.23+2.6.24-rc5.bb	9e64614b2b4500887ff09f7ff53ffccb90a7ff0a
@@ -2,7 +2,6 @@ DEFAULT_PREFERENCE = "-1"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_alix = "1"
 
 PR = "r3"
 
============================================================
--- packages/linux/linux_2.6.25.bb	ed037c79f846e5b7c53db483560819488aadcdcf
+++ packages/linux/linux_2.6.25.bb	908bd7f32af38ac35b5fed1ed57e60c950bcb8c9
@@ -6,6 +6,7 @@ DEFAULT_PREFERENCE_cm-x270 = "1"
 DEFAULT_PREFERENCE_kilauea = "1"
 DEFAULT_PREFERENCE_sequoia = "1"
 DEFAULT_PREFERENCE_cm-x270 = "1"
+DEFAULT_PREFERENCE_alix = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
            file://defconfig"