From fe2be6a9a3230f4920dae5e6925554204790898a Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 7 May 2012 20:11:43 +0000 Subject: kernel: update linux 3.3 to 3.3.5 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31645 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm63xx/Makefile | 2 +- .../brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch | 2 +- .../brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch | 2 +- target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch | 2 +- .../linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch | 2 +- .../415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch | 2 +- target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch | 2 +- .../patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'target/linux/brcm63xx') diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index f00704bd3..41c98c15e 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=brcm63xx BOARDNAME:=Broadcom BCM63xx FEATURES:=squashfs jffs2 usb atm pci pcmcia -LINUX_VERSION:=3.3.4 +LINUX_VERSION:=3.3.5 MAINTAINER:=Florian Fainelli include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch b/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch index aad6c5c94..7b213c346 100644 --- a/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch +++ b/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch @@ -66,7 +66,7 @@ Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device. #include #include -@@ -944,6 +945,9 @@ int __init board_register_devices(void) +@@ -943,6 +944,9 @@ int __init board_register_devices(void) !board_get_mac_address(board.enet1.mac_addr)) bcm63xx_enet_register(1, &board.enet1); diff --git a/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch b/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch index fec36ea58..5021ab4aa 100644 --- a/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch +++ b/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch @@ -49,7 +49,7 @@ Subject: [PATCH 26/63] MIPS: BCM63XX: register ehci device. #include #include -@@ -945,6 +946,9 @@ int __init board_register_devices(void) +@@ -944,6 +945,9 @@ int __init board_register_devices(void) !board_get_mac_address(board.enet1.mac_addr)) bcm63xx_enet_register(1, &board.enet1); diff --git a/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch index a2d38d45d..002f5a1ae 100644 --- a/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch +++ b/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch @@ -12,7 +12,7 @@ Signed-off-by: Axel Gembe --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -876,7 +876,7 @@ static struct mtd_partition mtd_partitio +@@ -875,7 +875,7 @@ static struct mtd_partition mtd_partitio } }; diff --git a/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch index f4cfe0b38..ac7dd6ec7 100644 --- a/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch +++ b/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -848,6 +848,8 @@ void __init board_prom_init(void) +@@ -847,6 +847,8 @@ void __init board_prom_init(void) if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G3_EXT_MII | GPIO_MODE_6348_G0_EXT_MII; diff --git a/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch b/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch index dcbbd2953..e4da9fa33 100644 --- a/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch +++ b/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch @@ -13,7 +13,7 @@ Subject: [PATCH 31/63] bcm63xx_enet: add support for bcm6368 internal ethernet s --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -948,6 +948,10 @@ int __init board_register_devices(void) +@@ -947,6 +947,10 @@ int __init board_register_devices(void) !board_get_mac_address(board.enet1.mac_addr)) bcm63xx_enet_register(1, &board.enet1); diff --git a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch index 2a86d35a0..da8b0038b 100644 --- a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch @@ -95,7 +95,7 @@ /* dump cfe version */ cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; -@@ -2161,6 +2235,13 @@ int __init board_register_devices(void) +@@ -2160,6 +2234,13 @@ int __init board_register_devices(void) val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val &= MPI_CSBASE_BASE_MASK; diff --git a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch index e5fdeea60..3efa29e99 100644 --- a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch @@ -102,8 +102,8 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. }; static void __init nb4_nvram_fixup(void) -@@ -2283,12 +2361,25 @@ void __init board_prom_init(void) - bcm63xx_pci_enabled = 1; +@@ -2282,12 +2360,25 @@ void __init board_prom_init(void) + if (board.has_pci) { if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G2_PCI; + -- cgit v1.2.3