From 2f1b56443c564b97f49bd9584b437af9204bd489 Mon Sep 17 00:00:00 2001 From: kaloz Date: Mon, 4 May 2009 11:35:08 +0000 Subject: refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15581 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.28/100-board_support.patch | 2 +- .../brcm47xx/patches-2.6.28/270-ehci-ssb.patch | 2 +- .../brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch | 36 ++++++++-------------- .../patches-2.6.28/500-lzma_initramfs.patch | 14 ++++----- .../patches-2.6.28/900-disable_early_printk.patch | 6 ++-- 5 files changed, 24 insertions(+), 36 deletions(-) (limited to 'target/linux/brcm47xx/patches-2.6.28') diff --git a/target/linux/brcm47xx/patches-2.6.28/100-board_support.patch b/target/linux/brcm47xx/patches-2.6.28/100-board_support.patch index c6428ac02..ac5d9124e 100644 --- a/target/linux/brcm47xx/patches-2.6.28/100-board_support.patch +++ b/target/linux/brcm47xx/patches-2.6.28/100-board_support.patch @@ -15,7 +15,7 @@ extern char *system_type; --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h -@@ -2068,6 +2068,7 @@ +@@ -2069,6 +2069,7 @@ #define PCI_DEVICE_ID_TIGON3_5906M 0x1713 #define PCI_DEVICE_ID_BCM4401 0x4401 #define PCI_DEVICE_ID_BCM4401B0 0x4402 diff --git a/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch index 32eb0bdd7..68f7322ca 100644 --- a/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch +++ b/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch @@ -22,7 +22,7 @@ depends on USB --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1034,8 +1034,16 @@ MODULE_LICENSE ("GPL"); +@@ -1036,8 +1036,16 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ixp4xx_ehci_driver #endif diff --git a/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch index ad7e66702..ef6b71267 100644 --- a/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.28.7/arch/mips/Kconfig -=================================================================== ---- linux-2.6.28.7.orig/arch/mips/Kconfig 2009-03-17 17:26:23.000000000 +0100 -+++ linux-2.6.28.7/arch/mips/Kconfig 2009-03-17 17:27:33.000000000 +0100 +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig @@ -53,6 +53,7 @@ config BCM47XX select SSB_DRIVER_MIPS select SSB_DRIVER_EXTIF @@ -10,20 +8,16 @@ Index: linux-2.6.28.7/arch/mips/Kconfig select SSB_PCICORE_HOSTMODE if PCI select GENERIC_GPIO select SYS_HAS_EARLY_PRINTK -Index: linux-2.6.28.7/arch/mips/bcm47xx/Makefile -=================================================================== ---- linux-2.6.28.7.orig/arch/mips/bcm47xx/Makefile 2009-03-17 17:26:19.000000000 +0100 -+++ linux-2.6.28.7/arch/mips/bcm47xx/Makefile 2009-03-17 17:26:56.000000000 +0100 +--- a/arch/mips/bcm47xx/Makefile ++++ b/arch/mips/bcm47xx/Makefile @@ -3,4 +3,4 @@ # under Linux. # -obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o +obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o -Index: linux-2.6.28.7/arch/mips/bcm47xx/irq.c -=================================================================== ---- linux-2.6.28.7.orig/arch/mips/bcm47xx/irq.c 2009-03-17 17:26:19.000000000 +0100 -+++ linux-2.6.28.7/arch/mips/bcm47xx/irq.c 2009-03-17 17:26:23.000000000 +0100 +--- a/arch/mips/bcm47xx/irq.c ++++ b/arch/mips/bcm47xx/irq.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2004 Florian Schirmer @@ -51,10 +45,8 @@ Index: linux-2.6.28.7/arch/mips/bcm47xx/irq.c void plat_irq_dispatch(void) { u32 cause; -Index: linux-2.6.28.7/arch/mips/bcm47xx/nvram.c -=================================================================== ---- linux-2.6.28.7.orig/arch/mips/bcm47xx/nvram.c 2009-03-17 17:26:19.000000000 +0100 -+++ linux-2.6.28.7/arch/mips/bcm47xx/nvram.c 2009-03-17 17:26:23.000000000 +0100 +--- a/arch/mips/bcm47xx/nvram.c ++++ b/arch/mips/bcm47xx/nvram.c @@ -24,10 +24,10 @@ #include #include @@ -77,10 +69,8 @@ Index: linux-2.6.28.7/arch/mips/bcm47xx/nvram.c struct nvram_header *header; int i; u32 base, lim, off; -Index: linux-2.6.28.7/arch/mips/bcm47xx/setup.c -=================================================================== ---- linux-2.6.28.7.orig/arch/mips/bcm47xx/setup.c 2009-03-17 17:26:19.000000000 +0100 -+++ linux-2.6.28.7/arch/mips/bcm47xx/setup.c 2009-03-17 17:26:23.000000000 +0100 +--- a/arch/mips/bcm47xx/setup.c ++++ b/arch/mips/bcm47xx/setup.c @@ -2,7 +2,7 @@ * Copyright (C) 2004 Florian Schirmer * Copyright (C) 2005 Waldemar Brodkorb @@ -305,10 +295,8 @@ Index: linux-2.6.28.7/arch/mips/bcm47xx/setup.c + return 0; +} +device_initcall(bcm47xx_register_gpiodev); -Index: linux-2.6.28.7/arch/mips/bcm47xx/time.c -=================================================================== ---- linux-2.6.28.7.orig/arch/mips/bcm47xx/time.c 2009-03-17 17:26:19.000000000 +0100 -+++ linux-2.6.28.7/arch/mips/bcm47xx/time.c 2009-03-17 17:26:23.000000000 +0100 +--- a/arch/mips/bcm47xx/time.c ++++ b/arch/mips/bcm47xx/time.c @@ -22,11 +22,17 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/target/linux/brcm47xx/patches-2.6.28/500-lzma_initramfs.patch b/target/linux/brcm47xx/patches-2.6.28/500-lzma_initramfs.patch index c2acdeeca..6a4a666c3 100644 --- a/target/linux/brcm47xx/patches-2.6.28/500-lzma_initramfs.patch +++ b/target/linux/brcm47xx/patches-2.6.28/500-lzma_initramfs.patch @@ -1,5 +1,5 @@ ---- a/init/initramfs.c 2009-03-23 22:55:52.000000000 +0100 -+++ b/init/initramfs.c 2009-05-01 11:15:46.000000000 +0200 +--- a/init/initramfs.c ++++ b/init/initramfs.c @@ -7,6 +7,7 @@ #include #include @@ -8,7 +8,7 @@ static __initdata char *message; static void __init error(char *x) -@@ -475,6 +476,69 @@ +@@ -475,6 +476,69 @@ static void __init flush_window(void) outcnt = 0; } @@ -78,7 +78,7 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only) { int written; -@@ -509,12 +573,28 @@ +@@ -509,12 +573,28 @@ static char * __init unpack_to_rootfs(ch inptr = 0; outcnt = 0; /* bytes in output buffer */ bytes_out = 0; @@ -112,9 +112,9 @@ buf += inptr; len -= inptr; } ---- a/scripts/gen_initramfs_list.sh 2009-03-23 22:55:52.000000000 +0100 -+++ b/scripts/gen_initramfs_list.sh 2009-05-01 11:12:45.000000000 +0200 -@@ -287,7 +287,7 @@ +--- a/scripts/gen_initramfs_list.sh ++++ b/scripts/gen_initramfs_list.sh +@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then if [ "${is_cpio_compressed}" = "compressed" ]; then cat ${cpio_tfile} > ${output_file} else diff --git a/target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch b/target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch index 32b57764b..3f1aeef8d 100644 --- a/target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch +++ b/target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch @@ -1,6 +1,6 @@ ---- linux-2.6.28.9/arch/mips/Kconfig 2009-04-17 10:43:28.000000000 +0200 -+++ linux-2.6.28.9.new/arch/mips/Kconfig 2009-04-17 10:43:51.000000000 +0200 -@@ -56,7 +56,6 @@ +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -56,7 +56,6 @@ config BCM47XX select SSB_B43_PCI_BRIDGE if PCI select SSB_PCICORE_HOSTMODE if PCI select GENERIC_GPIO -- cgit v1.2.3