diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-12-31 15:26:26 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-12-31 15:26:26 +0000 |
commit | fd616b6d25557391843cac8e98c62a81f1e17f4b (patch) | |
tree | 9e113312181c3a6242ab078d163eb92f01e22904 /meta/packages/linux/linux-rp-2.6.23+2.6.24-rc6/zylonite-boot.patch | |
parent | 2e6c3db37bae5136673ba4a3793173bb5baaf6ca (diff) | |
download | openembedded-core-fd616b6d25557391843cac8e98c62a81f1e17f4b.tar.gz openembedded-core-fd616b6d25557391843cac8e98c62a81f1e17f4b.tar.bz2 openembedded-core-fd616b6d25557391843cac8e98c62a81f1e17f4b.tar.xz openembedded-core-fd616b6d25557391843cac8e98c62a81f1e17f4b.zip |
linux-rp: update 2.6.24-rc1 to 2.6.24-rc6, add some fixes from 2.6.23
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3391 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/linux/linux-rp-2.6.23+2.6.24-rc6/zylonite-boot.patch')
-rw-r--r-- | meta/packages/linux/linux-rp-2.6.23+2.6.24-rc6/zylonite-boot.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc6/zylonite-boot.patch b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc6/zylonite-boot.patch new file mode 100644 index 000000000..f41928eca --- /dev/null +++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc6/zylonite-boot.patch @@ -0,0 +1,45 @@ +From 04c42f566c68b757fdadf54e0e0f9dfe9f3f9b06 Mon Sep 17 00:00:00 2001 +From: eric miao <eric.miao@marvell.com> +Date: Tue, 19 Jun 2007 16:42:53 +0800 +Subject: [PATCH] [PATCH] make zylonite boot + +1. reuse head-xscale.S for XSC3 + +2. add a workaround for machine ID assignment, which should be done + by boot loader +--- + arch/arm/boot/compressed/Makefile | 4 ++++ + arch/arm/boot/compressed/head-xscale.S | 5 +++++ + 2 files changed, 9 insertions(+) + +Index: linux-2.6-pxa3/arch/arm/boot/compressed/Makefile +=================================================================== +--- linux-2.6-pxa3.orig/arch/arm/boot/compressed/Makefile 2007-09-24 11:25:57.000000000 +0200 ++++ linux-2.6-pxa3/arch/arm/boot/compressed/Makefile 2007-09-24 12:26:53.000000000 +0200 +@@ -40,6 +40,10 @@ + OBJS += head-xscale.o + endif + ++ifeq ($(CONFIG_CPU_XSC3),y) ++OBJS += head-xscale.o ++endif ++ + ifeq ($(CONFIG_PXA_SHARPSL),y) + OBJS += head-sharpsl.o + endif +Index: linux-2.6-pxa3/arch/arm/boot/compressed/head-xscale.S +=================================================================== +--- linux-2.6-pxa3.orig/arch/arm/boot/compressed/head-xscale.S 2007-09-24 11:42:27.000000000 +0200 ++++ linux-2.6-pxa3/arch/arm/boot/compressed/head-xscale.S 2007-09-24 12:26:02.000000000 +0200 +@@ -33,6 +33,11 @@ + bic r0, r0, #0x1000 @ clear Icache + mcr p15, 0, r0, c1, c0, 0 + ++#ifdef CONFIG_MACH_ZYLONITE ++ mov r7, #(MACH_TYPE_ZYLONITE & 0xff) ++ orr r7, r7, #(MACH_TYPE_ZYLONITE & 0xff00) ++#endif ++ + #ifdef CONFIG_ARCH_COTULLA_IDP + mov r7, #MACH_TYPE_COTULLA_IDP + #endif |