upgrade to 2.6.25.7, and refresh patches

SVN-Revision: 11523

4 files changed, 22 insertions, 39 deletions

diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile
index ea81351561..8c948239d4 100644
--- a/target/linux/rdc/Makefile
+++ b/target/linux/rdc/Makefile
@@ -11,7 +11,7 @@ BOARD:=rdc
 BOARDNAME:=RDC 321x
 FEATURES:=squashfs jffs2 pci
 
-LINUX_VERSION:=2.6.25.6
+LINUX_VERSION:=2.6.25.7
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/rdc/patches/001-rdc3210_flash_map.patch b/target/linux/rdc/patches/001-rdc3210_flash_map.patch
index ec80e30e5b..4c12471ec3 100644
--- a/target/linux/rdc/patches/001-rdc3210_flash_map.patch
+++ b/target/linux/rdc/patches/001-rdc3210_flash_map.patch
@@ -1,10 +1,8 @@
-Index: linux-2.6.24.7/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.24.7/drivers/mtd/maps/Kconfig
-@@ -117,6 +117,50 @@ config MTD_PNC2000
- 	  PNC-2000 is the name of Network Camera product from PHOTRON
- 	  Ltd. in Japan. It uses CFI-compliant flash.
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
+@@ -110,6 +110,50 @@
+ 	  Sun Microsystems boardsets.  This driver will require CFI support
+ 	  in the kernel, so if you did not enable CFI previously, do that now.
  
 +config MTD_RDC3210
 +	tristate "CFI Flash device mapped on RDC3210"
@@ -53,13 +51,11 @@ Index: linux-2.6.24.7/drivers/mtd/maps/Kconfig
  config MTD_SC520CDP
  	tristate "CFI Flash device mapped on AMD SC520 CDP"
  	depends on X86 && MTD_CFI && MTD_CONCAT
-Index: linux-2.6.24.7/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.24.7/drivers/mtd/maps/Makefile
-@@ -30,6 +30,7 @@ obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcms
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
+@@ -29,6 +29,7 @@
+ obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o
  obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o
- obj-$(CONFIG_MTD_PNC2000)	+= pnc2000.o
  obj-$(CONFIG_MTD_PCMCIA)	+= pcmciamtd.o
 +obj-$(CONFIG_MTD_RDC3210)	+= rdc3210.o
  obj-$(CONFIG_MTD_RPXLITE)	+= rpxlite.o
diff --git a/target/linux/rdc/patches/003-rootfstype.patch b/target/linux/rdc/patches/003-rootfstype.patch
index 15e002ad7f..55a4cd49f5 100644
--- a/target/linux/rdc/patches/003-rootfstype.patch
+++ b/target/linux/rdc/patches/003-rootfstype.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/init/do_mounts.c
-===================================================================
---- linux-2.6.24.7.orig/init/do_mounts.c
-+++ linux-2.6.24.7/init/do_mounts.c
-@@ -256,6 +256,8 @@ static void __init get_fs_names(char *pa
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -163,6 +163,8 @@
  {
  	char *s = page;
  
diff --git a/target/linux/rdc/patches/600-x86_lzma.patch b/target/linux/rdc/patches/600-x86_lzma.patch
index 269340d194..8d17f0f3c2 100644
--- a/target/linux/rdc/patches/600-x86_lzma.patch
+++ b/target/linux/rdc/patches/600-x86_lzma.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
-===================================================================
 --- /dev/null
-+++ linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
++++ b/arch/x86/boot/compressed/LzmaDecode.c
 @@ -0,0 +1,586 @@
 +/*
 +  LzmaDecode.c
@@ -589,10 +587,8 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}
-Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
-===================================================================
 --- /dev/null
-+++ linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
++++ b/arch/x86/boot/compressed/LzmaDecode.h
 @@ -0,0 +1,100 @@
 +/* 
 +  LzmaDecode.h
@@ -694,10 +690,8 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
 +    UInt32 *outSizeProcessed);
 +
 +#endif
-Index: linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
-===================================================================
 --- /dev/null
-+++ linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
++++ b/arch/x86/boot/compressed/lzma_misc.c
 @@ -0,0 +1,281 @@
 +/*
 + * lzma_misc.c
@@ -980,11 +974,9 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
 +	lzma_unzip();
 +	return;
 +}
-Index: linux-2.6.24.7/scripts/Makefile.lib
-===================================================================
---- linux-2.6.24.7.orig/scripts/Makefile.lib
-+++ linux-2.6.24.7/scripts/Makefile.lib
-@@ -166,4 +166,9 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS)
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -172,4 +172,9 @@
  quiet_cmd_gzip = GZIP    $@
  cmd_gzip = gzip -f -9 < $< > $@
  
@@ -995,18 +987,15 @@ Index: linux-2.6.24.7/scripts/Makefile.lib
 +cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0
 +# to use lzmacomp,
 +# cmd_lzma = lzmacomp $< 700 > $@
-Index: linux-2.6.24.7/scripts/lzma_kern
-===================================================================
 --- /dev/null
-+++ linux-2.6.24.7/scripts/lzma_kern
++++ b/scripts/lzma_kern
 @@ -0,0 +1,4 @@
 +get-size() { echo "$5" ;}
 +printf -v len '%.8x' "$(get-size $(ls -l "$1"))"
 +lzma e "$@"
 +echo -ne "\x$(echo $len | cut -c 7,8)\x$(echo $len | cut -c 5,6)\x$(echo $len | cut -c 3,4)\x$(echo $len | cut -c 1,2)" >> "$2"
-diff -urN linux-2.6.25.4/arch/x86/boot/compressed/Makefile linux-2.6.25.4.new/arch/x86/boot/compressed/Makefile
---- linux-2.6.25.4/arch/x86/boot/compressed/Makefile	2008-05-15 17:00:12.000000000 +0200
-+++ linux-2.6.25.4.new/arch/x86/boot/compressed/Makefile	2008-06-11 14:42:09.000000000 +0200
+--- a/arch/x86/boot/compressed/Makefile
++++ b/arch/x86/boot/compressed/Makefile
 @@ -4,7 +4,7 @@
  # create a compressed vmlinux image from the original vmlinux
  #