qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:55:55 +02:00
Code

kernel: update linux 3.6 to 3.6.7

Browse Source 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34227 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2012-11-18 08:41:31 +00:00
parent 777a1e41d4
commit b270e13375
16 changed files with 3607 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -5,8 +5,8 @@ LINUX_RELEASE?=1
ifeq ($(LINUX_VERSION),3.3.8) ifeq ($(LINUX_VERSION),3.3.8)
LINUX_KERNEL_MD5SUM:=21068f0fd262b9b3670947f7892e1d6b LINUX_KERNEL_MD5SUM:=21068f0fd262b9b3670947f7892e1d6b
endif endif
ifeq ($(LINUX_VERSION),3.6.6) ifeq ($(LINUX_VERSION),3.6.7)
LINUX_KERNEL_MD5SUM:=64a274af6e3a9268b4c67b0b51e51565 LINUX_KERNEL_MD5SUM:=7c959e3e0b6559ca3f1b7bf86fdc6370
endif endif
# disable the md5sum check for unknown kernel versions # disable the md5sum check for unknown kernel versions

2
target/linux/brcm63xx/Makefile
View File

@ -10,7 +10,7 @@ ARCH:=mips
BOARD:=brcm63xx BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM63xx BOARDNAME:=Broadcom BCM63xx
FEATURES:=squashfs jffs2 usb atm pci pcmcia FEATURES:=squashfs jffs2 usb atm pci pcmcia
LINUX_VERSION:=3.6.6 LINUX_VERSION:=3.6.7
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

6
target/linux/brcm63xx/patches-3.6/404-bcm963xx_flashmap.patch
View File

@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
.width = 2, .width = 2,
--- a/drivers/mtd/redboot.c --- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c
@@ -75,6 +75,7 @@ static int parse_redboot_partitions(stru @@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru
int nulllen = 0; int nulllen = 0;
int numslots; int numslots;
unsigned long offset; unsigned long offset;
@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
static char nullstring[] = "unallocated"; static char nullstring[] = "unallocated";
#endif #endif
@@ -179,6 +180,16 @@ static int parse_redboot_partitions(stru @@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru
goto out; goto out;
} }
@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
for (i = 0; i < numslots; i++) { for (i = 0; i < numslots; i++) {
struct fis_list *new_fl, **prev; struct fis_list *new_fl, **prev;
@@ -199,10 +210,10 @@ static int parse_redboot_partitions(stru @@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru
goto out; goto out;
} }
new_fl->img = &buf[i]; new_fl->img = &buf[i];

2
target/linux/brcm63xx/patches-3.6/438-MIPS-BCM63XX-enable-USB-for-BCM6328.patch
View File

@ -49,7 +49,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK; reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK;
--- a/drivers/usb/host/ohci-bcm63xx.c --- a/drivers/usb/host/ohci-bcm63xx.c
+++ b/drivers/usb/host/ohci-bcm63xx.c +++ b/drivers/usb/host/ohci-bcm63xx.c
@@ -94,7 +94,7 @@ static int __devinit ohci_hcd_bcm63xx_dr @@ -95,7 +95,7 @@ static int __devinit ohci_hcd_bcm63xx_dr
bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020, bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
USBH_PRIV_TEST_6358_REG); USBH_PRIV_TEST_6358_REG);

2
target/linux/brcm63xx/patches-3.6/441-MIPS-BCM63XX-enable-USB-for-BCM6362.patch
View File

@ -73,7 +73,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK; reg &= ~USBH_PRIV_SWAP_EHCI_DATA_MASK;
--- a/drivers/usb/host/ohci-bcm63xx.c --- a/drivers/usb/host/ohci-bcm63xx.c
+++ b/drivers/usb/host/ohci-bcm63xx.c +++ b/drivers/usb/host/ohci-bcm63xx.c
@@ -94,7 +94,7 @@ static int __devinit ohci_hcd_bcm63xx_dr @@ -95,7 +95,7 @@ static int __devinit ohci_hcd_bcm63xx_dr
bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020, bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020,
USBH_PRIV_TEST_6358_REG); USBH_PRIV_TEST_6358_REG);

3589
target/linux/generic/config-3.6.new Normal file
View File

File diff suppressed because it is too large Load Diff

2
target/linux/generic/patches-3.6/653-disable_netlink_trim.patch
View File

@ -1,6 +1,6 @@
--- a/net/netlink/af_netlink.c --- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c
@@ -882,25 +882,7 @@ void netlink_detachskb(struct sock *sk, @@ -893,25 +893,7 @@ void netlink_detachskb(struct sock *sk,
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
{ {

2
target/linux/lantiq/Makefile
View File

@ -13,7 +13,7 @@ SUBTARGETS:=danube ar9 vr9 falcon svip_be
LINUX_VERSION:=3.3.8 LINUX_VERSION:=3.3.8
#SUBTARGETS=xway ase #SUBTARGETS=xway ase
#LINUX_VERSION:=3.6.6 #LINUX_VERSION:=3.6.7
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves

2
target/linux/malta/Makefile
View File

@ -13,7 +13,7 @@ SUBTARGETS:=le be
INITRAMFS_EXTRA_FILES:= INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=3.6.6 LINUX_VERSION:=3.6.7
DEVICE_TYPE:=developerboard DEVICE_TYPE:=developerboard

7
target/linux/malta/patches-3.6/001-MIPS-fix-CBUS-UART-irq.patch
View File

@ -21,11 +21,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mti-malta/malta-platform.c | 2 +- arch/mips/mti-malta/malta-platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c
index a8beca8..a906153 100644
--- a/arch/mips/mti-malta/malta-platform.c --- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c +++ b/arch/mips/mti-malta/malta-platform.c
@@ -47,7 +47,7 @@ static struct plat_serial8250_port uart8250_data[] = { @@ -48,7 +48,7 @@ static struct plat_serial8250_port uart8
SMC_PORT(0x2F8, 3), SMC_PORT(0x2F8, 3),
{ {
.mapbase = 0x1f000900, /* The CBUS UART */ .mapbase = 0x1f000900, /* The CBUS UART */
@ -34,6 +32,3 @@ index a8beca8..a906153 100644
.uartclk = 3686400, /* Twice the usual clk! */ .uartclk = 3686400, /* Twice the usual clk! */
.iotype = UPIO_MEM32, .iotype = UPIO_MEM32,
.flags = CBUS_UART_FLAGS, .flags = CBUS_UART_FLAGS,
--
1.7.11.7

5
target/linux/malta/patches-3.6/002-MIPS-Malta-fix-build-failure.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mti-malta/malta-platform.c | 1 + arch/mips/mti-malta/malta-platform.c | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/arch/mips/mti-malta/malta-platform.c b/arch/mips/mti-malta/malta-platform.c
index c154181..7473217 100644
--- a/arch/mips/mti-malta/malta-platform.c --- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c +++ b/arch/mips/mti-malta/malta-platform.c
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
@ -23,6 +21,3 @@ index c154181..7473217 100644
#include <mtd/mtd-abi.h> #include <mtd/mtd-abi.h>
#define SMC_PORT(base, int) \ #define SMC_PORT(base, int) \
--
1.7.11.7

2
target/linux/ramips/Makefile
View File

@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
FEATURES:=squashfs FEATURES:=squashfs
LINUX_VERSION:=3.6.6 LINUX_VERSION:=3.6.7
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\ DEFAULT_PACKAGES+=\

6
target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.6.6/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
=================================================================== +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
--- linux-3.6.6.orig/drivers/mtd/chips/cfi_cmdset_0002.c
+++ linux-3.6.6/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
#include <linux/mtd/xip.h> #include <linux/mtd/xip.h>

2
target/linux/sparc/Makefile
View File

@ -11,7 +11,7 @@ BOARD:=sparc
BOARDNAME:=Sun UltraSPARC BOARDNAME:=Sun UltraSPARC
FEATURES+=fpu tgz jffs2 ext4 squashfs FEATURES+=fpu tgz jffs2 ext4 squashfs
LINUX_VERSION:=3.6.6 LINUX_VERSION:=3.6.7
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/uml/Makefile
View File

@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
FEATURES:=ext4 audio FEATURES:=ext4 audio
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=3.6.6 LINUX_VERSION:=3.6.7
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/uml/patches-3.6/901-lib_zlib_deflate_visible.patch
View File

@ -3,7 +3,7 @@ or as a module
--- a/lib/Kconfig --- a/lib/Kconfig
+++ b/lib/Kconfig +++ b/lib/Kconfig
@@ -108,7 +108,7 @@ config ZLIB_INFLATE @@ -178,7 +178,7 @@ config ZLIB_INFLATE
tristate tristate
config ZLIB_DEFLATE config ZLIB_DEFLATE