diff options
Diffstat (limited to 'target/linux/rdc/patches')
| -rw-r--r-- | target/linux/rdc/patches/001-x86_generic_gpio.patch | 15 | ||||
| -rw-r--r-- | target/linux/rdc/patches/002-r6040_ethernet.patch | 41 | ||||
| -rw-r--r-- | target/linux/rdc/patches/004-rdc_fixes.patch | 81 | ||||
| -rw-r--r-- | target/linux/rdc/patches/006-pci_ids.patch | 18 | ||||
| -rw-r--r-- | target/linux/rdc/patches/600-x86_lzma.patch | 38 |
5 files changed, 19 insertions, 174 deletions
diff --git a/target/linux/rdc/patches/001-x86_generic_gpio.patch b/target/linux/rdc/patches/001-x86_generic_gpio.patch deleted file mode 100644 index dff25a0cd..000000000 --- a/target/linux/rdc/patches/001-x86_generic_gpio.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: linux-2.6.24.7/arch/x86/Kconfig -=================================================================== ---- linux-2.6.24.7.orig/arch/x86/Kconfig -+++ linux-2.6.24.7/arch/x86/Kconfig -@@ -81,6 +81,10 @@ config GENERIC_BUG - default y - depends on BUG - -+config GENERIC_GPIO -+ bool -+ default n -+ - config GENERIC_HWEIGHT - bool - default y diff --git a/target/linux/rdc/patches/002-r6040_ethernet.patch b/target/linux/rdc/patches/002-r6040_ethernet.patch deleted file mode 100644 index fa484bf9e..000000000 --- a/target/linux/rdc/patches/002-r6040_ethernet.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: linux-2.6.24.7/drivers/net/Kconfig -=================================================================== ---- linux-2.6.24.7.orig/drivers/net/Kconfig -+++ linux-2.6.24.7/drivers/net/Kconfig -@@ -1449,6 +1449,24 @@ config APRICOT - To compile this driver as a module, choose M here. The module - will be called apricot. - -+config R6040 -+ tristate "RDC Fast-Ethernet support (EXPERIMENTAL)" -+ depends on NET_PCI && EXPERIMENTAL -+ select MII -+ help -+ If you have a network (Ethernet) controller of this type, say Y and -+ read the Ethernet-HOWTO, available from -+ <http://www.tldp.org/docs.html#howto>. -+ -+ To compile this driver as a module, choose M here and read -+ <file:Documentation/networking/net-modules.txt>. The module will be -+ called r6040. -+ -+ -+config R6040_NAPI -+ bool "NAPI support for R6040" -+ depends on R6040 -+ default y - config B44 - tristate "Broadcom 440x/47xx ethernet support" - depends on SSB_POSSIBLE -Index: linux-2.6.24.7/drivers/net/Makefile -=================================================================== ---- linux-2.6.24.7.orig/drivers/net/Makefile -+++ linux-2.6.24.7/drivers/net/Makefile -@@ -116,6 +116,7 @@ obj-$(CONFIG_LNE390) += lne390.o 8390.o - obj-$(CONFIG_NE3210) += ne3210.o 8390.o - obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o - obj-$(CONFIG_B44) += b44.o -+obj-$(CONFIG_R6040) += r6040.o - obj-$(CONFIG_FORCEDETH) += forcedeth.o - obj-$(CONFIG_NE_H8300) += ne-h8300.o - obj-$(CONFIG_AX88796) += ax88796.o diff --git a/target/linux/rdc/patches/004-rdc_fixes.patch b/target/linux/rdc/patches/004-rdc_fixes.patch deleted file mode 100644 index ce5fbfda1..000000000 --- a/target/linux/rdc/patches/004-rdc_fixes.patch +++ /dev/null @@ -1,81 +0,0 @@ -Index: linux-2.6.24.7/arch/x86/Kconfig -=================================================================== ---- linux-2.6.24.7.orig/arch/x86/Kconfig -+++ linux-2.6.24.7/arch/x86/Kconfig -@@ -304,6 +304,17 @@ config X86_VSMP - 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. -+ - endchoice - - config SCHED_NO_NO_OMIT_FRAME_POINTER -Index: linux-2.6.24.7/arch/x86/kernel/reboot_fixups_32.c -=================================================================== ---- linux-2.6.24.7.orig/arch/x86/kernel/reboot_fixups_32.c -+++ linux-2.6.24.7/arch/x86/kernel/reboot_fixups_32.c -@@ -30,6 +30,17 @@ static void cs5536_warm_reset(struct pci - udelay(50); /* shouldn't get here but be safe and spin a while */ - } - -+static void r8610_reset(struct pci_dev *dev) -+{ -+ int i; -+ -+ outl(0x80003840,0xCF8); -+ i=inl(0xCFC); -+ i |= 0x1600; -+ outl(i,0xCFC); -+ outb(1,0x92); -+} -+ - struct device_fixup { - unsigned int vendor; - unsigned int device; -@@ -40,6 +51,7 @@ static struct device_fixup fixups_table[ - { 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 }, - }; - - /* -Index: linux-2.6.24.7/arch/x86/Makefile_32 -=================================================================== ---- linux-2.6.24.7.orig/arch/x86/Makefile_32 -+++ linux-2.6.24.7/arch/x86/Makefile_32 -@@ -99,6 +99,11 @@ mflags-$(CONFIG_X86_ES7000) := -Iinclude - 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/ - -Index: linux-2.6.24.7/include/asm-x86/timex.h -=================================================================== ---- linux-2.6.24.7.orig/include/asm-x86/timex.h -+++ linux-2.6.24.7/include/asm-x86/timex.h -@@ -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/006-pci_ids.patch b/target/linux/rdc/patches/006-pci_ids.patch deleted file mode 100644 index dbc33c2cd..000000000 --- a/target/linux/rdc/patches/006-pci_ids.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: linux-2.6.24.7/include/linux/pci_ids.h -=================================================================== ---- linux-2.6.24.7.orig/include/linux/pci_ids.h -+++ linux-2.6.24.7/include/linux/pci_ids.h -@@ -2106,6 +2106,13 @@ - #define PCI_DEVICE_ID_HERC_WIN 0x5732 - #define PCI_DEVICE_ID_HERC_UNI 0x5832 - -+#define PCI_VENDOR_ID_RDC 0x17f3 -+#define PCI_DEVICE_ID_RDC_R6020 0x6020 -+#define PCI_DEVICE_ID_RDC_R6030 0x6030 -+#define PCI_DEVICE_ID_RDC_R6040 0x6040 -+#define PCI_DEVICE_ID_RDC_R6060 0x6060 -+#define PCI_DEVICE_ID_RDC_R6061 0x6061 -+ - #define PCI_VENDOR_ID_SITECOM 0x182d - #define PCI_DEVICE_ID_SITECOM_DC105V2 0x3069 - diff --git a/target/linux/rdc/patches/600-x86_lzma.patch b/target/linux/rdc/patches/600-x86_lzma.patch index 3bef6fa1a..269340d19 100644 --- a/target/linux/rdc/patches/600-x86_lzma.patch +++ b/target/linux/rdc/patches/600-x86_lzma.patch @@ -1004,31 +1004,28 @@ Index: linux-2.6.24.7/scripts/lzma_kern +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" -Index: linux-2.6.24.7/arch/x86/boot/compressed/Makefile_32 -=================================================================== ---- linux-2.6.24.7.orig/arch/x86/boot/compressed/Makefile_32 -+++ linux-2.6.24.7/arch/x86/boot/compressed/Makefile_32 -@@ -4,8 +4,8 @@ +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 +@@ -4,7 +4,7 @@ # create a compressed vmlinux image from the original vmlinux # --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 +-targets := vmlinux vmlinux.bin vmlinux.bin.gz head_$(BITS).o misc.o piggy.o ++targets := vmlinux vmlinux.bin vmlinux.bin.lzma head_$(BITS).o lzma_misc.o piggy.o + KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 + KBUILD_CFLAGS += -fno-strict-aliasing -fPIC +@@ -18,7 +18,7 @@ + LDFLAGS := -m elf_$(UTS_MACHINE) LDFLAGS_vmlinux := -T -@@ -17,7 +17,7 @@ KBUILD_CFLAGS := -m32 -D__KERNEL__ $(LI - $(call cc-option,-fno-stack-protector) - LDFLAGS := -m elf_i386 --$(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 +-$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/piggy.o FORCE ++$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/lzma_misc.o $(obj)/piggy.o FORCE $(call if_changed,ld) @: -@@ -37,14 +37,14 @@ $(obj)/vmlinux.bin.all: $(vmlinux.bin.al +@@ -44,11 +44,11 @@ $(call if_changed,relocbin) ifdef CONFIG_RELOCATABLE @@ -1042,9 +1039,12 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/Makefile_32 +$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE + $(call if_changed,lzma) endif - LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T --$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.gz FORCE -+$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.lzma FORCE +@@ -60,5 +60,5 @@ + endif + + +-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE ++$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.lzma FORCE $(call if_changed,ld) |