[oe-commits] org.oe.dev merge of '3aba2971138df7aa582ac37918b74312095155a5'

[oe commit]

merge of '3aba2971138df7aa582ac37918b74312095155a5'
     and 'f2ba366303b50ed577f12c11d8179b1c9c3e5255'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3c1f4ae7f38adbd0f67e3136740e33da13136335
ViewMTN: http://monotone.openembedded.org/revision/info/3c1f4ae7f38adbd0f67e3136740e33da13136335
Files:
1
packages/linux/linux-beagleboard
packages/linux/linux-beagleboard_git.bb
packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux_2.6.24.bb
Diffs:

#
# mt diff -r3aba2971138df7aa582ac37918b74312095155a5 -r3c1f4ae7f38adbd0f67e3136740e33da13136335
#
#
#
# delete "packages/linux/linux-beagleboard"
# 
# delete "packages/linux/linux-beagleboard_git.bb"
# 
# patch "packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff"
#  from [86e40f2bc89fe704fa1e86d062c4fbcf200cfa00]
#    to [5b8b065bd8faae9b61b1f2bb144a64aa2756eba3]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff	86e40f2bc89fe704fa1e86d062c4fbcf200cfa00
+++ packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff	5b8b065bd8faae9b61b1f2bb144a64aa2756eba3
@@ -2,12 +2,12 @@ Signed-off-by: Koen Kooi <koen at openembed
 
 Signed-off-by: Koen Kooi <koen at openembedded.org>
 ---
- board-omap3beagle.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
+ Makefile            |    3 ++-
+ board-omap3beagle.c |   12 ++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
 --- /tmp/board-omap3beagle.c	2008-04-16 18:12:56.347129861 +0200
-+++ git/arch/arm/mach-omap2/board-omap3beagle.c	2008-04-16 18:15:25.079135583 +0200
-@@ -48,8 +48,17 @@
++++ git/arch/arm/mach-omap2/board-omap3beagle.c	2008-04-16 19:02:08.490169463 +0200
+@@ -48,15 +48,27 @@
  	omap_gpio_init();
  }
  
@@ -24,4 +24,26 @@ Signed-off-by: Koen Kooi <koen at openembed
 +	{OMAP_TAG_MMC, &omap3beagle_mmc_config },
  };
  
++extern void __init sdp_mmc_init(void);
++
  static void __init omap3_beagle_init(void)
+ {
+ 	omap_board_config = omap3_beagle_config;
+ 	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
+ 	omap_serial_init();
++	sdp_mmc_init();
+ }
+ 
+ arch_initcall(omap3_beagle_i2c_init);
+--- /tmp/Makefile	2008-04-16 19:08:53.653462476 +0200
++++ git/arch/arm/mach-omap2/Makefile	2008-04-16 19:09:15.836793250 +0200
+@@ -35,7 +35,8 @@
+ 					   board-3430sdp-usb.o \
+ 					   board-3430sdp-flash.o
+ obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o
+-obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o
++obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o \
++					   board-sdp-hsmmc.o 
+ obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o \
+ 					   board-apollon-mmc.o	\
+ 					   board-apollon-keys.o


#
# mt diff -rf2ba366303b50ed577f12c11d8179b1c9c3e5255 -r3c1f4ae7f38adbd0f67e3136740e33da13136335
#
#
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch"
#  content [bf271d9de4ce4c25b913e724dd0f6f56435f7f9a]
# 
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig"
#  from [513031550df4c84414c69b00aeea62dd5b61825c]
#    to [0b75d9d74fd82e3a550b805465eea4d9532530a5]
# 
# patch "packages/linux/linux_2.6.24.bb"
#  from [1698797d4e832dd0ac53b480d89c620c02d4add1]
#    to [5819d62f743069d615e51ce38e88a46104232fd3]
#
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch	bf271d9de4ce4c25b913e724dd0f6f56435f7f9a
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch	bf271d9de4ce4c25b913e724dd0f6f56435f7f9a
@@ -0,0 +1,12 @@
+diff -urN linux-2.6.24.orig/drivers/pcmcia/yenta_socket.c linux-2.6.24/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.24.orig/drivers/pcmcia/yenta_socket.c	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/pcmcia/yenta_socket.c	2008-04-16 18:03:38.000000000 +0200
+@@ -551,7 +551,7 @@
+  * max 4 MB, min 16 kB. We try very hard to not get below
+  * the "ACC" values, though.
+  */
+-#define BRIDGE_MEM_MAX 4*1024*1024
++#define BRIDGE_MEM_MAX 64*1024*1024
+ #define BRIDGE_MEM_ACC 128*1024
+ #define BRIDGE_MEM_MIN 16*1024
+ 
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig	513031550df4c84414c69b00aeea62dd5b61825c
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig	0b75d9d74fd82e3a550b805465eea4d9532530a5
@@ -218,7 +218,21 @@ CONFIG_PCI_LEGACY=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
 CONFIG_PCI_LEGACY=y
-# CONFIG_PCCARD is not set
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+# CONFIG_PCMCIA is not set
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PCCARD_NONSTATIC=m
 # CONFIG_HOTPLUG_PCI is not set
 
 #
============================================================
--- packages/linux/linux_2.6.24.bb	1698797d4e832dd0ac53b480d89c620c02d4add1
+++ packages/linux/linux_2.6.24.bb	5819d62f743069d615e51ce38e88a46104232fd3
@@ -10,7 +10,7 @@ DEFAULT_PREFERENCE_ts72xx = "1"
 DEFAULT_PREFERENCE_at32stk1000 = "1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
@@ -47,7 +47,9 @@ SRC_URI_append_mpc8313e-rdb = "\
 SRC_URI_append_mpc8313e-rdb = "\
 	file://mpc831x-nand.patch;patch=1 \
 	file://mpc8313e-rdb-leds.patch;patch=1 \
-	file://mpc8313e-rdb-rtc.patch;patch=1"
+	file://mpc8313e-rdb-rtc.patch;patch=1 \
+	file://mpc8313e-rdb-cardbus.patch;patch=1 \
+	"
 
 CMDLINE_gesbc-9302 = "console=ttyAM0 root=mtd5 rootfstype=jffs2 mtdparts=GESBC-NAND:64m(app),-(data)"