From 0ab106f1f08f87203e7bcdb1ec896d1e62a65416 Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@balister.org>
Date: Mon, 28 Apr 2008 18:32:43 +0000
Subject: linux-omap2 : Update to current git HEAD revision. Drop patches that
are upstream.
---
.../beagleboard/add-beagle-sd-support.diff | 71 ----------------------
.../beagleboard/add-beagle-usb-support.diff | 53 ----------------
packages/linux/linux-omap2_git.bb | 3 +-
3 files changed, 1 insertion(+), 126 deletions(-)
delete mode 100644 packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
delete mode 100644 packages/linux/linux-omap2-git/beagleboard/add-beagle-usb-support.diff
(limited to 'packages')
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
deleted file mode 100644
index b66f926d81..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-From dac3cdc5952ab39fa7ae0545d43e2daa95329b07 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@openembedded.org>
-Date: Wed, 23 Apr 2008 09:38:31 +0200
-Subject: [PATCH] omap3beagle: register SD interface
-
-Signed-off-by: Koen Kooi <koen@openembedded.org>
----
- arch/arm/mach-omap2/Makefile | 3 ++-
- arch/arm/mach-omap2/board-omap3beagle.c | 9 +++++++++
- include/asm-arm/arch-omap/board-omap3beagle.h | 2 ++
- 3 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
-index 9414141..84d99d2 100644
---- a/arch/arm/mach-omap2/Makefile
-+++ b/arch/arm/mach-omap2/Makefile
-@@ -35,7 +35,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
- 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
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 0727ee2..c03bb26 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -48,8 +48,16 @@ static void __init omap3_beagle_init_irq(void)
- omap_gpio_init();
- }
-
-+static struct omap_mmc_config omap3beagle_mmc_config __initdata = {
-+ .mmc [0] = {
-+ .enabled = 1,
-+ .wire4 = 1,
-+ },
-+};
-+
- static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
- { OMAP_TAG_UART, &omap3_beagle_uart_config },
-+ { OMAP_TAG_MMC, &omap3beagle_mmc_config },
- };
-
- static void __init omap3_beagle_init(void)
-@@ -57,6 +65,7 @@ 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);
-diff --git a/include/asm-arm/arch-omap/board-omap3beagle.h b/include/asm-arm/arch-omap/board-omap3beagle.h
-index c42db78..fcdf0bc 100644
---- a/include/asm-arm/arch-omap/board-omap3beagle.h
-+++ b/include/asm-arm/arch-omap/board-omap3beagle.h
-@@ -29,6 +29,8 @@
- #ifndef __ASM_ARCH_OMAP3_BEAGLE_H
- #define __ASM_ARCH_OMAP3_BEAGLE_H
-
-+extern void sdp_mmc_init(void);
-+
- #ifdef CONFIG_TWL4030_CORE
-
- #define TWL4030_IRQNUM INT_34XX_SYS_NIRQ
---
-1.5.4.3
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/add-beagle-usb-support.diff b/packages/linux/linux-omap2-git/beagleboard/add-beagle-usb-support.diff
deleted file mode 100644
index e7f810bf9a..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/add-beagle-usb-support.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-From 101e01552974e9ce7b4bf26aa5e4a203130b6dfd Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@openembedded.org>
-Date: Thu, 24 Apr 2008 12:28:53 +0200
-Subject: [PATCH] omap3beagle: register USB interfaces
-
-Signed-off-by: Koen Kooi <koen@openembedded.org>
----
- arch/arm/mach-omap2/Makefile | 3 ++-
- arch/arm/mach-omap2/board-omap3beagle.c | 1 +
- include/asm-arm/arch-omap/board-omap3beagle.h | 1 +
- 3 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
-index c37df1a..10607cf 100644
---- a/arch/arm/mach-omap2/Makefile
-+++ b/arch/arm/mach-omap2/Makefile
-@@ -37,7 +37,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
- board-3430sdp-flash.o
- obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o
- obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
-- board-sdp-hsmmc.o
-+ board-sdp-hsmmc.o \
-+ board-3430sdp-usb.o
- obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \
- board-apollon-mmc.o \
- board-apollon-keys.o
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index c03bb26..3e14b6b 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -66,6 +66,7 @@ static void __init omap3_beagle_init(void)
- omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
- omap_serial_init();
- sdp_mmc_init();
-+ sdp3430_usb_init();
- }
-
- arch_initcall(omap3_beagle_i2c_init);
-diff --git a/include/asm-arm/arch-omap/board-omap3beagle.h b/include/asm-arm/arch-omap/board-omap3beagle.h
-index 782e2e5..5f78621 100644
---- a/include/asm-arm/arch-omap/board-omap3beagle.h
-+++ b/include/asm-arm/arch-omap/board-omap3beagle.h
-@@ -30,6 +30,7 @@
- #define __ASM_ARCH_OMAP3_BEAGLE_H
-
- extern void sdp_mmc_init(void);
-+extern void sdp3430_usb_init(void);
-
- #define TWL4030_IRQNUM INT_34XX_SYS_NIRQ
-
---
-1.5.4.3
-
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 84127e60e7..8b448092e6 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,7 +2,7 @@ require linux-omap.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "7f7e34f8fc2b6819f1a516f7955ef15d04eca716"
+SRCREV = "4bb9f8b58ed7d14d276750d1792cef9b3aa1e9ec"
PV = "2.6.25+git${SRCREV}"
PR = "r5"
@@ -12,7 +12,6 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
file://defconfig"
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
- file://add-beagle-usb-support.diff;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
--
cgit v1.2.3