Upgrade rdc to 2.6.24

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10453 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 107 insertions, 123 deletions

diff --git a/target/linux/rdc/patches/001-x86_generic_gpio.patch b/target/linux/rdc/patches/001-x86_generic_gpio.patch
index db3d866a1..ad2102f63 100644
--- a/target/linux/rdc/patches/001-x86_generic_gpio.patch
+++ b/target/linux/rdc/patches/001-x86_generic_gpio.patch
@@ -1,7 +1,7 @@
-diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
 index 97b64d7..f8c1d32 100644
---- a/arch/i386/Kconfig
-+++ b/arch/i386/Kconfig
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
 @@ -79,6 +79,10 @@ config GENERIC_BUG
         default y
         depends on BUG
diff --git a/target/linux/rdc/patches/004-rdc_fixes.patch b/target/linux/rdc/patches/004-rdc_fixes.patch
index 7b87773cf..47f8c08c6 100644
--- a/target/linux/rdc/patches/004-rdc_fixes.patch
+++ b/target/linux/rdc/patches/004-rdc_fixes.patch
@@ -1,73 +1,77 @@
-diff -urN linux-2.6.19/arch/i386/Kconfig linux-2.6.19.new/arch/i386/Kconfig
---- linux-2.6.19/arch/i386/Kconfig	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/i386/Kconfig	2006-12-17 17:13:33.000000000 +0100
-@@ -180,6 +180,16 @@
- 	  Only choose this option if you have such a system, otherwise you
- 	  should say N here.
+diff -urN linux-2.6.24/arch/x86/Kconfig linux-2.6.24.new/arch/x86/Kconfig
+--- linux-2.6.24/arch/x86/Kconfig	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/x86/Kconfig	2008-02-11 18:24:27.000000000 +0100
+@@ -300,6 +300,17 @@
+ 	  supposed to run on these EM64T-based machines.  Only choose this option
+ 	  if you have one of these machines.
  
 +config X86_RDC
 +	bool "Support for RDC 3211 boards"
 +	select GENERIC_GPIO
 +	select LEDS_GPIO
++	select LEDS_CLASS
 +	help
-+	  Support for RDC 3211 systems. Say 'Y' here if the kernel is 
-+	  supposed to run on an IA-32 RDC R3211 system.
-+	  Only choose this option if you have such as system, otherwise you
-+	  should say N here.
++          Support for RDC 3211 systems. Say 'Y' here if the kernel is
++          supposed to run on an IA-32 RDC R3211 system.
++          Only choose this option if you have such as system, otherwise you
++          should say N here.
 +
  endchoice
  
- config ACPI_SRAT
-diff -urN linux-2.6.19/arch/i386/Makefile linux-2.6.19.new/arch/i386/Makefile
---- linux-2.6.19/arch/i386/Makefile	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/i386/Makefile	2006-12-17 17:13:33.000000000 +0100
-@@ -92,6 +92,10 @@
- mflags-$(CONFIG_X86_ES7000)	:= -Iinclude/asm-i386/mach-es7000
- mcore-$(CONFIG_X86_ES7000)	:= mach-default
- core-$(CONFIG_X86_ES7000)	:= arch/i386/mach-es7000/
-+# RDC subarch support
-+mflags-$(CONFIG_X86_RDC)	:= -Iinclude/asm-i386/mach-rdc
-+mcore-$(CONFIG_X86_RDC)		:= mach-default
-+core-$(CONFIG_X86_RDC)		+= arch/i386/mach-rdc/
- 
- # default subarch .h files
- mflags-y += -Iinclude/asm-i386/mach-default
---- timex.h	2007-08-07 10:44:03.816112250 -0700
-+++ linux/include/asm-i386/timex.h	2007-08-07 10:48:47.905866750 -0700
-@@ -11,6 +11,8 @@
+ config SCHED_NO_NO_OMIT_FRAME_POINTER
+diff -urN linux-2.6.24/arch/x86/kernel/reboot_fixups_32.c linux-2.6.24.new/arch/x86/kernel/reboot_fixups_32.c
+--- linux-2.6.24/arch/x86/kernel/reboot_fixups_32.c	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/x86/kernel/reboot_fixups_32.c	2008-02-11 18:26:18.000000000 +0100
+@@ -30,6 +30,17 @@
+ 	udelay(50); /* shouldn't get here but be safe and spin a while */
+ }
  
- #ifdef CONFIG_X86_ELAN
- #  define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */
-+#elif defined(CONFIG_X86_RDC)
-+#  define CLOCK_TICK_RATE 1041667 /* Underlying HZ for R8610 */
- #else
- #  define CLOCK_TICK_RATE 1193182 /* Underlying HZ */
- #endif
---- reboot_fixups.c	2007-08-07 12:02:00.908412250 -0700
-+++ linux/arch/i386/kernel/reboot_fixups.c	2007-08-07 12:18:49.391438500 -0700
-@@ -13,6 +13,17 @@
- #include <linux/pci.h>
- #include <asm/reboot_fixups.h>
- #include <asm/msr.h>
-+
 +static void r8610_reset(struct pci_dev *dev)
 +{
-+	int i;
++       int i;
 +
-+	outl(0x80003840,0xCF8);
-+	i=inl(0xCFC);
-+	i |= 0x1600;
-+	outl(i,0xCFC);
-+	outb(1,0x92);
++       outl(0x80003840,0xCF8);
++       i=inl(0xCFC);
++       i |= 0x1600;
++       outl(i,0xCFC);
++       outb(1,0x92);
 +}
- 
- static void cs5530a_warm_reset(struct pci_dev *dev)
- {
-@@ -40,6 +53,7 @@
- };
- 
- static struct device_fixup fixups_table[] = {
-+{ PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030, r8610_reset },
++
+ struct device_fixup {
+ 	unsigned int vendor;
+ 	unsigned int device;
+@@ -40,6 +51,7 @@
  { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset },
  { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset },
+ { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset },
++{ PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030, r8610_reset },
  };
+ 
+ /*
+diff -urN linux-2.6.24/arch/x86/Makefile_32 linux-2.6.24.new/arch/x86/Makefile_32
+--- linux-2.6.24/arch/x86/Makefile_32	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/x86/Makefile_32	2008-02-11 18:25:12.000000000 +0100
+@@ -99,6 +99,11 @@
+ mcore-$(CONFIG_X86_ES7000)	:= arch/x86/mach-default
+ core-$(CONFIG_X86_ES7000)	:= arch/x86/mach-es7000/
+ 
++# RDC subarch support
++mflags-$(CONFIG_X86_RDC)       := -Iinclude/asm-x86/mach-rdc
++mcore-$(CONFIG_X86_RDC)        := arch/x86/mach-default
++core-$(CONFIG_X86_RDC)         += arch/x86/mach-rdc/
++
+ # Xen paravirtualization support
+ core-$(CONFIG_XEN)		+= arch/x86/xen/
+ 
+diff -urN linux-2.6.24/include/asm-x86/timex.h linux-2.6.24.new/include/asm-x86/timex.h
+--- linux-2.6.24/include/asm-x86/timex.h	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/include/asm-x86/timex.h	2008-02-11 18:25:43.000000000 +0100
+@@ -7,6 +7,8 @@
+ 
+ #ifdef CONFIG_X86_ELAN
+ #  define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */
++#elif defined(CONFIG_X86_RDC)
++#  define PIT_TICK_RATE 1041667 /* Underlying HZ for R8610 */
+ #else
+ #  define PIT_TICK_RATE 1193182 /* Underlying HZ */
+ #endif
diff --git a/target/linux/rdc/patches/005-rdc_x86_cpu_type.patch b/target/linux/rdc/patches/005-rdc_x86_cpu_type.patch
deleted file mode 100644
index 9e0eefb09..000000000
--- a/target/linux/rdc/patches/005-rdc_x86_cpu_type.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN linux-2.6.22.1/arch/i386/kernel/cpu/Makefile linux-2.6.22.1.new/arch/i386/kernel/cpu/Makefile
---- linux-2.6.22.1/arch/i386/kernel/cpu/Makefile	2007-08-11 22:16:24.000000000 +0200
-+++ linux-2.6.22.1.new/arch/i386/kernel/cpu/Makefile	2007-08-13 16:37:32.000000000 +0200
-@@ -12,6 +12,7 @@
- obj-y	+=	rise.o
- obj-y	+=	nexgen.o
- obj-y	+=	umc.o
-+obj-$(CONFIG_X86_RDC)	+=	rdc.o
- 
- obj-$(CONFIG_X86_MCE)	+=	mcheck/
- 
-diff -urN linux-2.6.22.1/arch/i386/kernel/cpu/Makefile linux-2.6.22.1.new/arch/i386/kernel/cpu/Makefile
---- linux-2.6.22.1/include/asm-i386/processor.h	2007-08-13 16:42:25.000000000 +0200
-+++ linux-2.6.22.1.new/include/asm-i386/processor.h	2007-08-13 16:51:19.000000000 +0200
-@@ -92,6 +92,7 @@
- #define X86_VENDOR_TRANSMETA 7
- #define X86_VENDOR_NSC 8
- #define X86_VENDOR_NUM 9
-+#define X86_VENDOR_RDC 0xff
- #define X86_VENDOR_UNKNOWN 0xff
- 
- /*
diff --git a/target/linux/rdc/patches/600-x86_lzma.patch b/target/linux/rdc/patches/600-x86_lzma.patch
index bb10f1fdc..292ec88ff 100644
--- a/target/linux/rdc/patches/600-x86_lzma.patch
+++ b/target/linux/rdc/patches/600-x86_lzma.patch
@@ -1,6 +1,6 @@
-diff -Naur linux-old/arch/i386/boot/compressed/LzmaDecode.c linux-lzma/arch/i386/boot/compressed/LzmaDecode.c
---- linux-old/arch/i386/boot/compressed/LzmaDecode.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-lzma/arch/i386/boot/compressed/LzmaDecode.c	2005-06-05 00:07:38.000000000 -0400
+diff -Naur linux-old/arch/x86/boot/compressed/LzmaDecode.c linux-lzma/arch/i386/boot/compressed/LzmaDecode.c
+--- linux-old/arch/x86/boot/compressed/LzmaDecode.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-lzma/arch/x86/boot/compressed/LzmaDecode.c	2005-06-05 00:07:38.000000000 -0400
 @@ -0,0 +1,586 @@
 +/*
 +  LzmaDecode.c
@@ -588,9 +588,9 @@ diff -Naur linux-old/arch/i386/boot/compressed/LzmaDecode.c linux-lzma/arch/i386
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}
-diff -Naur linux-old/arch/i386/boot/compressed/LzmaDecode.h linux-lzma/arch/i386/boot/compressed/LzmaDecode.h
---- linux-old/arch/i386/boot/compressed/LzmaDecode.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-lzma/arch/i386/boot/compressed/LzmaDecode.h	2005-06-05 00:07:39.000000000 -0400
+diff -Naur linux-old/arch/x86/boot/compressed/LzmaDecode.h linux-lzma/arch/i386/boot/compressed/LzmaDecode.h
+--- linux-old/arch/x86/boot/compressed/LzmaDecode.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-lzma/arch/x86/boot/compressed/LzmaDecode.h	2005-06-05 00:07:39.000000000 -0400
 @@ -0,0 +1,100 @@
 +/* 
 +  LzmaDecode.h
@@ -692,9 +692,9 @@ diff -Naur linux-old/arch/i386/boot/compressed/LzmaDecode.h linux-lzma/arch/i386
 +    UInt32 *outSizeProcessed);
 +
 +#endif
-diff -Naur linux-old/arch/i386/boot/compressed/lzma_misc.c linux-lzma/arch/i386/boot/compressed/lzma_misc.c
---- linux-old/arch/i386/boot/compressed/lzma_misc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-lzma/arch/i386/boot/compressed/lzma_misc.c	2005-06-04 21:33:48.000000000 -0400
+diff -Naur linux-old/arch/x86/boot/compressed/lzma_misc.c linux-lzma/arch/i386/boot/compressed/lzma_misc.c
+--- linux-old/arch/x86/boot/compressed/lzma_misc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-lzma/arch/x86/boot/compressed/lzma_misc.c	2005-06-04 21:33:48.000000000 -0400
 @@ -0,0 +1,281 @@
 +/*
 + * lzma_misc.c
@@ -977,24 +977,48 @@ diff -Naur linux-old/arch/i386/boot/compressed/lzma_misc.c linux-lzma/arch/i386/
 +	lzma_unzip();
 +	return;
 +}
-diff -Naur linux-old/arch/i386/boot/compressed/Makefile linux-lzma/arch/i386/boot/compressed/Makefile
---- linux-old/arch/i386/boot/compressed/Makefile	2005-06-04 21:53:40.000000000 -0400
-+++ linux-lzma/arch/i386/boot/compressed/Makefile	2005-06-05 00:25:23.000000000 -0400
-@@ -4,7 +4,7 @@
+diff -urN linux-2.6.19.2/scripts/Makefile.lib linux-2.6.19.2.new/scripts/Makefile.lib
+--- linux-2.6.19.2/scripts/Makefile.lib	2007-01-10 20:10:37.000000000 +0100
++++ linux-2.6.19.2.new/scripts/Makefile.lib	2007-04-15 23:51:54.000000000 +0200
+@@ -162,4 +162,9 @@
+ quiet_cmd_gzip = GZIP    $@
+ cmd_gzip = gzip -f -9 < $< > $@
+ 
+-
++# LZMA
++#
++quiet_cmd_lzma = LZMA $@
++cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0
++# to use lzmacomp,
++# cmd_lzma = lzmacomp $< 700 > $@
+diff -u linux/scripts/lzma_kern linux/scripts/lzma_kern
+--- linux/scripts/lzma_kern	2007-07-27 20:18:17.013014750 -0700
++++ linux/scripts/lzma_kern	2007-07-27 20:18:17.013014750 -0700
+@@ -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.24/arch/x86/boot/compressed/Makefile_32 linux-2.6.24.new/arch/x86/boot/compressed/Makefile_32
+--- linux-2.6.24/arch/x86/boot/compressed/Makefile_32	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/x86/boot/compressed/Makefile_32	2008-02-13 15:21:03.000000000 +0100
+@@ -4,8 +4,8 @@
  # create a compressed vmlinux image from the original vmlinux
  #
  
--targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o \
-+targets		:= vmlinux vmlinux.bin vmlinux.bin.lzma head.o lzma_misc.o piggy.o \
- 			vmlinux.bin.all vmlinux.relocs
+-targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head_32.o misc_32.o piggy.o \
+-			vmlinux.bin.all vmlinux.relocs
++targets		:= vmlinux vmlinux.bin vmlinux.bin.lzma head_32.o piggy.o \
++			vmlinux.bin.all vmlinux.relocs lzma_misc.o
  EXTRA_AFLAGS	:= -traditional
  
+ LDFLAGS_vmlinux := -T
 @@ -17,7 +17,7 @@
  	   $(call cc-option,-fno-stack-protector)
  LDFLAGS := -m elf_i386
  
--$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
-+$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/lzma_misc.o $(obj)/piggy.o FORCE
+-$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/misc_32.o $(obj)/piggy.o FORCE
++$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/lzma_misc.o $(obj)/piggy.o FORCE
  	$(call if_changed,ld)
  	@:
  
@@ -1015,28 +1039,6 @@ diff -Naur linux-old/arch/i386/boot/compressed/Makefile linux-lzma/arch/i386/boo
  
  LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T
  
--$(obj)/piggy.o: $(src)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
-+$(obj)/piggy.o: $(src)/vmlinux.scr $(obj)/vmlinux.bin.lzma FORCE
+-$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.gz FORCE
++$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.lzma FORCE
  	$(call if_changed,ld)
-diff -urN linux-2.6.19.2/scripts/Makefile.lib linux-2.6.19.2.new/scripts/Makefile.lib
---- linux-2.6.19.2/scripts/Makefile.lib	2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2.new/scripts/Makefile.lib	2007-04-15 23:51:54.000000000 +0200
-@@ -162,4 +162,9 @@
- quiet_cmd_gzip = GZIP    $@
- cmd_gzip = gzip -f -9 < $< > $@
- 
--
-+# LZMA
-+#
-+quiet_cmd_lzma = LZMA $@
-+cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0
-+# to use lzmacomp,
-+# cmd_lzma = lzmacomp $< 700 > $@
-diff -u linux/scripts/lzma_kern linux/scripts/lzma_kern
---- linux/scripts/lzma_kern	2007-07-27 20:18:17.013014750 -0700
-+++ linux/scripts/lzma_kern	2007-07-27 20:18:17.013014750 -0700
-@@ -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"