From 031ea08ef0295b6185b2c70de27e9bf640b21400 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 20 May 2011 10:06:18 +0000 Subject: [PATCH] refresh patches SVN-Revision: 26957 --- .../patches-2.6.37/430-board_gw6200_gw6000.patch | 2 +- .../patches-2.6.37/440-new_96348gw-11_leds.patch | 2 +- .../patches-2.6.37/445-96348gw_a_leds.patch | 2 +- .../brcm63xx/patches-2.6.37/450-board-MAGIC.patch | 4 ++-- .../brcm63xx/patches-2.6.37/451-board_hw553.patch | 4 ++-- .../patches-2.6.37/452-board_rta1320_16m.patch | 2 +- .../patches-2.6.37/453-board_spw303v.patch | 4 ++-- .../brcm63xx/patches-2.6.37/454-board_V2500V.patch | 14 ++++++-------- .../500-ssb-add-callback-for-sprom.patch | 4 ++-- .../977-ssb_export_fallback_sprom.patch | 4 ++-- 10 files changed, 20 insertions(+), 22 deletions(-) diff --git a/target/linux/brcm63xx/patches-2.6.37/430-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-2.6.37/430-board_gw6200_gw6000.patch index 2e2398eb8e4..4b799a29902 100644 --- a/target/linux/brcm63xx/patches-2.6.37/430-board_gw6200_gw6000.patch +++ b/target/linux/brcm63xx/patches-2.6.37/430-board_gw6200_gw6000.patch @@ -118,7 +118,7 @@ static struct board_info __initdata board_FAST2404 = { .name = "F@ST2404", .expected_cpu_id = 0x6348, -@@ -1521,6 +1632,8 @@ static const struct board_info __initdat +@@ -1527,6 +1638,8 @@ static const struct board_info __initdat #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, &board_96348gw, diff --git a/target/linux/brcm63xx/patches-2.6.37/440-new_96348gw-11_leds.patch b/target/linux/brcm63xx/patches-2.6.37/440-new_96348gw-11_leds.patch index e1b63426557..c1b8649c969 100644 --- a/target/linux/brcm63xx/patches-2.6.37/440-new_96348gw-11_leds.patch +++ b/target/linux/brcm63xx/patches-2.6.37/440-new_96348gw-11_leds.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -1642,6 +1685,7 @@ static const struct board_info __initdat +@@ -1648,6 +1691,7 @@ static const struct board_info __initdat &board_rta1025w_16, &board_96348_D4PW, &board_spw500v, diff --git a/target/linux/brcm63xx/patches-2.6.37/445-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-2.6.37/445-96348gw_a_leds.patch index 3e80bc4f502..9caccbb65a3 100644 --- a/target/linux/brcm63xx/patches-2.6.37/445-96348gw_a_leds.patch +++ b/target/linux/brcm63xx/patches-2.6.37/445-96348gw_a_leds.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -670,6 +670,19 @@ +@@ -670,6 +670,19 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, diff --git a/target/linux/brcm63xx/patches-2.6.37/450-board-MAGIC.patch b/target/linux/brcm63xx/patches-2.6.37/450-board-MAGIC.patch index c192e5360a3..3fb9ae32f96 100644 --- a/target/linux/brcm63xx/patches-2.6.37/450-board-MAGIC.patch +++ b/target/linux/brcm63xx/patches-2.6.37/450-board-MAGIC.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -775,6 +775,76 @@ static struct board_info __initdata boar +@@ -794,6 +794,76 @@ static struct board_info __initdata boar }, }; @@ -77,7 +77,7 @@ #endif /* -@@ -1686,6 +1756,7 @@ static const struct board_info __initdat +@@ -1705,6 +1775,7 @@ static const struct board_info __initdat &board_96348_D4PW, &board_spw500v, &board_ct536_ct5621, diff --git a/target/linux/brcm63xx/patches-2.6.37/451-board_hw553.patch b/target/linux/brcm63xx/patches-2.6.37/451-board_hw553.patch index 6a288c31dba..bb5004a2c46 100644 --- a/target/linux/brcm63xx/patches-2.6.37/451-board_hw553.patch +++ b/target/linux/brcm63xx/patches-2.6.37/451-board_hw553.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1730,6 +1730,79 @@ static struct board_info __initdata boar +@@ -1749,6 +1749,79 @@ static struct board_info __initdata boar }; #endif @@ -80,7 +80,7 @@ /* * all boards */ -@@ -1771,6 +1844,7 @@ static const struct board_info __initdat +@@ -1790,6 +1863,7 @@ static const struct board_info __initdat &board_nb4_ser_r2, &board_nb4_fxc_r1, &board_nb4_fxc_r2, diff --git a/target/linux/brcm63xx/patches-2.6.37/452-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-2.6.37/452-board_rta1320_16m.patch index 11ab4a31840..4117606cfa0 100644 --- a/target/linux/brcm63xx/patches-2.6.37/452-board_rta1320_16m.patch +++ b/target/linux/brcm63xx/patches-2.6.37/452-board_rta1320_16m.patch @@ -44,7 +44,7 @@ #endif /* -@@ -1811,6 +1848,7 @@ static const struct board_info __initdat +@@ -1830,6 +1867,7 @@ static const struct board_info __initdat &board_96338gw, &board_96338w, &board_96338w2_e7t, diff --git a/target/linux/brcm63xx/patches-2.6.37/453-board_spw303v.patch b/target/linux/brcm63xx/patches-2.6.37/453-board_spw303v.patch index 8e97fcf00c9..6b3cc4820b2 100644 --- a/target/linux/brcm63xx/patches-2.6.37/453-board_spw303v.patch +++ b/target/linux/brcm63xx/patches-2.6.37/453-board_spw303v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1728,6 +1728,72 @@ static struct board_info __initdata boar +@@ -1784,6 +1784,72 @@ static struct board_info __initdata boar .spis = nb4_spi_devices, .num_spis = ARRAY_SIZE(nb4_spi_devices), }; @@ -73,7 +73,7 @@ #endif static struct board_info __initdata board_HW553 = { -@@ -1845,6 +1911,7 @@ static const struct board_info __initdat +@@ -1902,6 +1968,7 @@ static const struct board_info __initdat &board_nb4_fxc_r1, &board_nb4_fxc_r2, &board_HW553, diff --git a/target/linux/brcm63xx/patches-2.6.37/454-board_V2500V.patch b/target/linux/brcm63xx/patches-2.6.37/454-board_V2500V.patch index 9cdef38a54f..9c4eb891166 100644 --- a/target/linux/brcm63xx/patches-2.6.37/454-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-2.6.37/454-board_V2500V.patch @@ -1,8 +1,6 @@ -Index: b/arch/mips/bcm63xx/boards/board_bcm963xx.c -=================================================================== ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 2011-03-21 08:29:36.500387994 +0000 -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 2011-03-31 12:35:08.209787004 +0100 -@@ -845,6 +845,63 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -901,6 +901,63 @@ static struct board_info __initdata boar }, }; @@ -66,7 +64,7 @@ Index: b/arch/mips/bcm63xx/boards/board_bcm963xx.c #endif /* -@@ -1830,6 +1887,7 @@ +@@ -1953,6 +2010,7 @@ static const struct board_info __initdat &board_spw500v, &board_ct536_ct5621, &board_96348sv, @@ -74,7 +72,7 @@ Index: b/arch/mips/bcm63xx/boards/board_bcm963xx.c #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1977,6 +2035,22 @@ +@@ -2101,6 +2159,22 @@ void __init board_prom_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); @@ -97,7 +95,7 @@ Index: b/arch/mips/bcm63xx/boards/board_bcm963xx.c /* dump cfe version */ cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; -@@ -2184,6 +2258,14 @@ +@@ -2308,6 +2382,14 @@ 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-2.6.37/500-ssb-add-callback-for-sprom.patch b/target/linux/brcm63xx/patches-2.6.37/500-ssb-add-callback-for-sprom.patch index 6c241622a11..ef77c6963a8 100644 --- a/target/linux/brcm63xx/patches-2.6.37/500-ssb-add-callback-for-sprom.patch +++ b/target/linux/brcm63xx/patches-2.6.37/500-ssb-add-callback-for-sprom.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1927,6 +1927,17 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -2071,6 +2071,17 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; @@ -18,7 +18,7 @@ #endif /* -@@ -2111,8 +2122,9 @@ void __init board_prom_init(void) +@@ -2271,8 +2282,9 @@ void __init board_prom_init(void) if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); diff --git a/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch index 7671d19781b..8f929459903 100644 --- a/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch +++ b/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1907,7 +1907,7 @@ static void __init nb4_nvram_fixup(void) +@@ -2051,7 +2051,7 @@ static void __init nb4_nvram_fixup(void) * bcm4318 WLAN work */ #ifdef CONFIG_SSB_PCIHOST @@ -9,7 +9,7 @@ .revision = 0x02, .board_rev = 0x17, .country_code = 0x0, -@@ -1927,6 +1927,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -2071,6 +2071,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; -- 2.30.2