diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-06-06 23:34:34 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-06-06 23:34:34 +0000 |
| commit | 71212645ee0ea7b278cc86004bf17b7be06b8cc3 (patch) | |
| tree | 02f87f2c8cbbbd42b0ff715594ffd53f540ecb7e /target/linux/rb532-2.6/patches | |
| parent | 4fa29882b54a750c3caba81064f28df31fcd32f2 (diff) | |
fix rb532 patch error
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rb532-2.6/patches')
| -rw-r--r-- | target/linux/rb532-2.6/patches/140-cmdline_hack.patch | 32 | ||||
| -rw-r--r-- | target/linux/rb532-2.6/patches/500-Nand.patch | 17 |
2 files changed, 18 insertions, 31 deletions
diff --git a/target/linux/rb532-2.6/patches/140-cmdline_hack.patch b/target/linux/rb532-2.6/patches/140-cmdline_hack.patch index 50c299a65..4425af7de 100644 --- a/target/linux/rb532-2.6/patches/140-cmdline_hack.patch +++ b/target/linux/rb532-2.6/patches/140-cmdline_hack.patch @@ -1,28 +1,14 @@ -diff -ur linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S ---- linux.old/arch/mips/kernel/head.S 2006-12-06 17:30:27.000000000 +0100 -+++ linux.dev/arch/mips/kernel/head.S 2006-12-06 18:34:43.000000000 +0100 -@@ -129,15 +129,20 @@ - #endif - .endm - -- +Index: linux-2.6.21.1/arch/mips/kernel/head.S +=================================================================== +--- linux-2.6.21.1.orig/arch/mips/kernel/head.S 2007-06-07 01:26:11.862575128 +0200 ++++ linux-2.6.21.1/arch/mips/kernel/head.S 2007-06-07 01:31:06.499783464 +0200 +@@ -133,6 +133,9 @@ j kernel_entry nop -- -+ nop -+ + ++EXPORT(_image_cmdline) ++ .ascii "CMDLINE:" ++ /* * Reserved space for exception handlers. * Necessary for machines which link their kernels at KSEG0. -+ * Use as temporary storage for the kernel command line, so that it -+ * can be updated easily without having to relink the kernel. - */ -- .fill 0x400 -+ -+EXPORT(_image_cmdline) -+ .ascii "CMDLINE:" -+ .fill 0x3ec - - EXPORT(stext) # used for profiling - EXPORT(_stext) - diff --git a/target/linux/rb532-2.6/patches/500-Nand.patch b/target/linux/rb532-2.6/patches/500-Nand.patch index 6189ecb8e..7e4cb65c7 100644 --- a/target/linux/rb532-2.6/patches/500-Nand.patch +++ b/target/linux/rb532-2.6/patches/500-Nand.patch @@ -1,6 +1,7 @@ -diff -urN linux.old/drivers/mtd/nand/Kconfig linux.dev/drivers/mtd/nand/Kconfig ---- linux.old/drivers/mtd/nand/Kconfig 2006-11-29 22:57:37.000000000 +0100 -+++ linux.dev/drivers/mtd/nand/Kconfig 2006-12-14 04:38:51.000000000 +0100 +Index: linux-2.6.21.1/drivers/mtd/nand/Kconfig +=================================================================== +--- linux-2.6.21.1.orig/drivers/mtd/nand/Kconfig 2007-04-27 23:49:26.000000000 +0200 ++++ linux-2.6.21.1/drivers/mtd/nand/Kconfig 2007-06-07 01:31:30.927069952 +0200 @@ -75,6 +75,12 @@ help Support for NAND flash on Technologic Systems TS-7250 platform. @@ -14,10 +15,11 @@ diff -urN linux.old/drivers/mtd/nand/Kconfig linux.dev/drivers/mtd/nand/Kconfig config MTD_NAND_IDS tristate -diff -urN linux.old/drivers/mtd/nand/Makefile linux.dev/drivers/mtd/nand/Makefile ---- linux.old/drivers/mtd/nand/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ linux.dev/drivers/mtd/nand/Makefile 2006-12-14 04:38:51.000000000 +0100 -@@ -9,6 +9,7 @@ +Index: linux-2.6.21.1/drivers/mtd/nand/Makefile +=================================================================== +--- linux-2.6.21.1.orig/drivers/mtd/nand/Makefile 2007-04-27 23:49:26.000000000 +0200 ++++ linux-2.6.21.1/drivers/mtd/nand/Makefile 2007-06-07 01:31:30.927069952 +0200 +@@ -10,6 +10,7 @@ obj-$(CONFIG_MTD_NAND_SPIA) += spia.o obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o obj-$(CONFIG_MTD_NAND_TOTO) += toto.o @@ -25,4 +27,3 @@ diff -urN linux.old/drivers/mtd/nand/Makefile linux.dev/drivers/mtd/nand/Makefil obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o - |