summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-04-16 18:02:59 +0000
committerKoen Kooi <koen@openembedded.org>2008-04-16 18:02:59 +0000
commitb63321a1b405538e9cb5f2e925bb453daf95051a (patch)
tree44dc59072c22021aedbb34eaf9d40fe679794f6e /packages/linux
parentc41f5386cdf7120c1a18131d1512b190c3b447fd (diff)
linux omap2 git: update beagleboard sd patch
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-beagleboard/.mtn2git_empty0
-rw-r--r--packages/linux/linux-beagleboard_git.bb14
-rw-r--r--packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff32
3 files changed, 27 insertions, 19 deletions
diff --git a/packages/linux/linux-beagleboard/.mtn2git_empty b/packages/linux/linux-beagleboard/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/linux-beagleboard/.mtn2git_empty
+++ /dev/null
diff --git a/packages/linux/linux-beagleboard_git.bb b/packages/linux/linux-beagleboard_git.bb
deleted file mode 100644
index b7096deabb..0000000000
--- a/packages/linux/linux-beagleboard_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require linux.inc
-
-SRCREV = "039ced63db6a3f90f8b8f23a74499e38c0462b27"
-PV = "2.6.24+2.6.25rc7-git${SRCREV}"
-PR = "r2"
-
-COMPATIBLE_MACHINE = "beagleboard"
-
-
-SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
- file://beagle-board-patch-dirk.diff;patch=1 \
- file://defconfig"
-
-S = "${WORKDIR}/git"
diff --git a/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff b/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
index f31566fa7d..26278d381c 100644
--- a/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
+++ b/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
@@ -2,12 +2,12 @@ omap3beagle: register SD interface
Signed-off-by: Koen Kooi <koen@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@openembedded.org>
+ {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