Signed-off-by: Jonas Gorski <jonas.gorski+open...@gmail.com>
---
.../linux/brcm63xx/{config-2.6.39 => config-3.0} | 5 +++--
.../007-usb-ohci-support.patch | 2 +-
.../008-usb-ehci-support.patch | 2 +-
.../010-add_bcm63xx_ohci_controller.patch | 2 +-
.../011-add_bcm63xx_ehci_controller.patch | 6 +++---
.../040-bcm963xx_flashmap.patch | 6 +++---
.../041-bcm963xx_real_rootfs_length.patch | 0
.../070_bcm63xx_enet_vlan_incoming_fixed.patch | 2 +-
.../100-reset_buttons.patch | 4 ++--
.../110-gpiodev.patch | 4 ++--
.../141-led_count.patch | 4 ++--
.../180-udc_preliminary_support.patch | 2 +-
.../200-extended-platform-devices.patch | 2 +-
.../200-spi-board-info.patch | 2 +-
.../210-no_ehci_over_current_check.patch | 2 +-
.../220-wl_exports.patch | 2 +-
.../230-6358-enet1-external-mii-clk.patch | 2 +-
.../{patches-2.6.39 => patches-3.0}/240-spi.patch | 4 ++--
.../250-boardid_fixup.patch | 4 ++--
.../300-alice_gate2_leds.patch | 0
.../310-96348gw_a_leds.patch | 0
.../440-board-D4PW.patch | 0
.../441-board-NB4.patch | 2 +-
.../442-board-96338W2_E7T.patch | 0
.../443-board-CPVA642.patch | 0
.../444-board_dsl_274xb_rev_c.patch | 0
.../445-board_spw500v.patch | 0
.../447-board_gw6200_gw6000.patch | 0
.../448-board-MAGIC.patch | 0
.../449-board_hw553.patch | 0
.../450-board_rta1320_16m.patch | 0
.../451-board_spw303v.patch | 0
.../452-board_V2500V.patch | 4 ++--
.../453-board_BTV2110.patch | 0
.../454-board_livebox.patch | 0
.../455-board_ct536_ct5621.patch | 0
.../977-ssb_export_fallback_sprom.patch | 0
37 files changed, 32 insertions(+), 31 deletions(-)
copy target/linux/brcm63xx/{config-2.6.39 => config-3.0} (98%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/007-usb-ohci-support.patch (98%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/008-usb-ehci-support.patch (98%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/010-add_bcm63xx_ohci_controller.patch (99%)
copy target/linux/brcm63xx/{patches-2.6.38 =>
patches-3.0}/011-add_bcm63xx_ehci_controller.patch (96%)
copy target/linux/brcm63xx/{patches-2.6.38 =>
patches-3.0}/040-bcm963xx_flashmap.patch (95%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/041-bcm963xx_real_rootfs_length.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/070_bcm63xx_enet_vlan_incoming_fixed.patch (81%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/100-reset_buttons.patch (94%)
copy target/linux/brcm63xx/{patches-2.6.39 => patches-3.0}/110-gpiodev.patch
(81%)
copy target/linux/brcm63xx/{patches-2.6.39 => patches-3.0}/141-led_count.patch
(83%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/180-udc_preliminary_support.patch (99%)
copy target/linux/brcm63xx/{patches-2.6.38 =>
patches-3.0}/200-extended-platform-devices.patch (91%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/200-spi-board-info.patch (92%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/210-no_ehci_over_current_check.patch (88%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/220-wl_exports.patch (94%)
copy target/linux/brcm63xx/{patches-2.6.38 =>
patches-3.0}/230-6358-enet1-external-mii-clk.patch (93%)
copy target/linux/brcm63xx/{patches-2.6.39 => patches-3.0}/240-spi.patch (99%)
copy target/linux/brcm63xx/{patches-2.6.38 =>
patches-3.0}/250-boardid_fixup.patch (92%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/300-alice_gate2_leds.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/310-96348gw_a_leds.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/440-board-D4PW.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.39 => patches-3.0}/441-board-NB4.patch
(99%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/442-board-96338W2_E7T.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/443-board-CPVA642.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/444-board_dsl_274xb_rev_c.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/445-board_spw500v.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/447-board_gw6200_gw6000.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/448-board-MAGIC.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/449-board_hw553.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/450-board_rta1320_16m.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/451-board_spw303v.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/452-board_V2500V.patch (95%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/453-board_BTV2110.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.39 =>
patches-3.0}/454-board_livebox.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/455-board_ct536_ct5621.patch (100%)
copy target/linux/brcm63xx/{patches-2.6.37 =>
patches-3.0}/977-ssb_export_fallback_sprom.patch (100%)
diff --git a/target/linux/brcm63xx/config-2.6.39
b/target/linux/brcm63xx/config-3.0
similarity index 98%
copy from target/linux/brcm63xx/config-2.6.39
copy to target/linux/brcm63xx/config-3.0
index e3cd44d..2fa9a10 100644
--- a/target/linux/brcm63xx/config-2.6.39
+++ b/target/linux/brcm63xx/config-3.0
@@ -19,8 +19,10 @@ CONFIG_BCM63XX_CPU_6358=y
CONFIG_BCM63XX_ENET=y
CONFIG_BCM63XX_PHY=y
CONFIG_BCM63XX_WDT=y
+CONFIG_BCMA_POSSIBLE=y
CONFIG_BOARD_BCM963XX=y
# CONFIG_BOARD_LIVEBOX is not set
+# CONFIG_BRCMUTIL is not set
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CEVT_R4K=y
@@ -48,8 +50,6 @@ CONFIG_GENERIC_ATOMIC64=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_GPIO=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GPIOLIB=y
@@ -89,6 +89,7 @@ CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_IRQ_CPU=y
CONFIG_KEXEC=y
+# CONFIG_LANTIQ is not set
CONFIG_LEDS_GPIO=y
CONFIG_MACH_NO_WESTBRIDGE=y
# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
diff --git a/target/linux/brcm63xx/patches-2.6.37/007-usb-ohci-support.patch
b/target/linux/brcm63xx/patches-3.0/007-usb-ohci-support.patch
similarity index 98%
copy from target/linux/brcm63xx/patches-2.6.37/007-usb-ohci-support.patch
copy to target/linux/brcm63xx/patches-3.0/007-usb-ohci-support.patch
index a70b501..e4327af 100644
--- a/target/linux/brcm63xx/patches-2.6.37/007-usb-ohci-support.patch
+++ b/target/linux/brcm63xx/patches-3.0/007-usb-ohci-support.patch
@@ -52,7 +52,7 @@ Signed-off-by: Maxime Bizon <mbi...@freebox.fr>
#include <board_bcm963xx.h>
#define PFX "board_bcm963xx: "
-@@ -877,6 +878,9 @@ int __init board_register_devices(void)
+@@ -889,6 +890,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-2.6.39/008-usb-ehci-support.patch
b/target/linux/brcm63xx/patches-3.0/008-usb-ehci-support.patch
similarity index 98%
copy from target/linux/brcm63xx/patches-2.6.39/008-usb-ehci-support.patch
copy to target/linux/brcm63xx/patches-3.0/008-usb-ehci-support.patch
index 0c236f0..c044e52 100644
--- a/target/linux/brcm63xx/patches-2.6.39/008-usb-ehci-support.patch
+++ b/target/linux/brcm63xx/patches-3.0/008-usb-ehci-support.patch
@@ -44,7 +44,7 @@ Signed-off-by: Maxime Bizon <mbi...@freebox.fr>
#include <board_bcm963xx.h>
#define PFX "board_bcm963xx: "
-@@ -878,6 +879,9 @@ int __init board_register_devices(void)
+@@ -890,6 +891,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-2.6.39/010-add_bcm63xx_ohci_controller.patch
b/target/linux/brcm63xx/patches-3.0/010-add_bcm63xx_ohci_controller.patch
similarity index 99%
copy from
target/linux/brcm63xx/patches-2.6.39/010-add_bcm63xx_ohci_controller.patch
copy to target/linux/brcm63xx/patches-3.0/010-add_bcm63xx_ohci_controller.patch
index 39c732f..2c32a20 100644
--- a/target/linux/brcm63xx/patches-2.6.39/010-add_bcm63xx_ohci_controller.patch
+++ b/target/linux/brcm63xx/patches-3.0/010-add_bcm63xx_ohci_controller.patch
@@ -177,7 +177,7 @@ Signed-off-by: Maxime Bizon <mbi...@freebox.fr>
+MODULE_ALIAS("platform:bcm63xx_ohci");
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
-@@ -1054,6 +1054,11 @@ MODULE_LICENSE ("GPL");
+@@ -1056,6 +1056,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ohci_hcd_da8xx_driver
#endif
diff --git
a/target/linux/brcm63xx/patches-2.6.38/011-add_bcm63xx_ehci_controller.patch
b/target/linux/brcm63xx/patches-3.0/011-add_bcm63xx_ehci_controller.patch
similarity index 96%
copy from
target/linux/brcm63xx/patches-2.6.38/011-add_bcm63xx_ehci_controller.patch
copy to target/linux/brcm63xx/patches-3.0/011-add_bcm63xx_ehci_controller.patch
index 28a1b2b..d287c52 100644
--- a/target/linux/brcm63xx/patches-2.6.38/011-add_bcm63xx_ehci_controller.patch
+++ b/target/linux/brcm63xx/patches-3.0/011-add_bcm63xx_ehci_controller.patch
@@ -118,7 +118,7 @@ Signed-off-by: Maxime Bizon <mbi...@freebox.fr>
+ ehci->big_endian_desc = 0;
+ ehci->caps = hcd->regs;
+ ehci->regs = hcd->regs +
-+ HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
++ HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
+ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+ ehci->sbrn = 0x20;
+
@@ -164,8 +164,8 @@ Signed-off-by: Maxime Bizon <mbi...@freebox.fr>
+MODULE_ALIAS("platform:bcm63xx_ehci");
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1254,6 +1254,11 @@ MODULE_LICENSE ("GPL");
- #define PLATFORM_DRIVER ehci_msm_driver
+@@ -1282,6 +1282,11 @@ MODULE_LICENSE ("GPL");
+ #define PLATFORM_DRIVER ehci_grlib_driver
#endif
+#ifdef CONFIG_BCM63XX
diff --git a/target/linux/brcm63xx/patches-2.6.38/040-bcm963xx_flashmap.patch
b/target/linux/brcm63xx/patches-3.0/040-bcm963xx_flashmap.patch
similarity index 95%
copy from target/linux/brcm63xx/patches-2.6.38/040-bcm963xx_flashmap.patch
copy to target/linux/brcm63xx/patches-3.0/040-bcm963xx_flashmap.patch
index a216230..6a352da 100644
--- a/target/linux/brcm63xx/patches-2.6.38/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-3.0/040-bcm963xx_flashmap.patch
@@ -12,7 +12,7 @@ Signed-off-by: Axel Gembe <a...@bastart.eu.org>
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -816,20 +816,6 @@ void __init board_setup(void)
+@@ -828,20 +828,6 @@ void __init board_setup(void)
panic("unexpected CPU for bcm963xx board");
}
@@ -33,7 +33,7 @@ Signed-off-by: Axel Gembe <a...@bastart.eu.org>
static struct resource mtd_resources[] = {
{
.start = 0, /* filled at runtime */
-@@ -839,12 +825,9 @@ static struct resource mtd_resources[] =
+@@ -851,12 +837,9 @@ static struct resource mtd_resources[] =
};
static struct platform_device mtd_dev = {
@@ -97,7 +97,7 @@ Signed-off-by: Axel Gembe <a...@bastart.eu.org>
+#endif
}
- return add_mtd_partitions(bcm963xx_mtd_info, parsed_parts,
+ return mtd_device_register(bcm963xx_mtd_info, parsed_parts,
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -57,7 +57,7 @@ static inline int redboot_checksum(struc
diff --git
a/target/linux/brcm63xx/patches-2.6.39/041-bcm963xx_real_rootfs_length.patch
b/target/linux/brcm63xx/patches-3.0/041-bcm963xx_real_rootfs_length.patch
similarity index 100%
copy from
target/linux/brcm63xx/patches-2.6.39/041-bcm963xx_real_rootfs_length.patch
copy to target/linux/brcm63xx/patches-3.0/041-bcm963xx_real_rootfs_length.patch
diff --git
a/target/linux/brcm63xx/patches-2.6.39/070_bcm63xx_enet_vlan_incoming_fixed.patch
b/target/linux/brcm63xx/patches-3.0/070_bcm63xx_enet_vlan_incoming_fixed.patch
similarity index 81%
copy from
target/linux/brcm63xx/patches-2.6.39/070_bcm63xx_enet_vlan_incoming_fixed.patch
copy to
target/linux/brcm63xx/patches-3.0/070_bcm63xx_enet_vlan_incoming_fixed.patch
index 8211e29..332acfa 100644
---
a/target/linux/brcm63xx/patches-2.6.39/070_bcm63xx_enet_vlan_incoming_fixed.patch
+++
b/target/linux/brcm63xx/patches-3.0/070_bcm63xx_enet_vlan_incoming_fixed.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
-@@ -1515,7 +1515,7 @@ static int compute_hw_mtu(struct bcm_ene
+@@ -1516,7 +1516,7 @@ static int compute_hw_mtu(struct bcm_ene
actual_mtu = mtu;
/* add ethernet header + vlan tag size */
diff --git a/target/linux/brcm63xx/patches-2.6.39/100-reset_buttons.patch
b/target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch
similarity index 94%
copy from target/linux/brcm63xx/patches-2.6.39/100-reset_buttons.patch
copy to target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch
index 786c18b..486054f 100644
--- a/target/linux/brcm63xx/patches-2.6.39/100-reset_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch
@@ -43,7 +43,7 @@
};
static struct board_info __initdata board_FAST2404 = {
-@@ -838,12 +860,23 @@ static struct platform_device bcm63xx_gp
+@@ -850,12 +872,23 @@ static struct platform_device bcm63xx_gp
.dev.platform_data = &bcm63xx_led_data,
};
@@ -67,7 +67,7 @@
if (board.has_uart0)
bcm63xx_uart_register(0);
-@@ -888,5 +921,16 @@ int __init board_register_devices(void)
+@@ -900,5 +933,16 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_leds);
diff --git a/target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch
b/target/linux/brcm63xx/patches-3.0/110-gpiodev.patch
similarity index 81%
copy from target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch
copy to target/linux/brcm63xx/patches-3.0/110-gpiodev.patch
index fc99f53..8283a54 100644
--- a/target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch
+++ b/target/linux/brcm63xx/patches-3.0/110-gpiodev.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -852,6 +852,10 @@ static struct platform_device mtd_dev =
+@@ -864,6 +864,10 @@ static struct platform_device mtd_dev =
.num_resources = ARRAY_SIZE(mtd_resources),
};
@@ -11,7 +11,7 @@
static struct gpio_led_platform_data bcm63xx_led_data;
static struct platform_device bcm63xx_gpio_leds = {
-@@ -916,6 +920,8 @@ int __init board_register_devices(void)
+@@ -928,6 +932,8 @@ int __init board_register_devices(void)
platform_device_register(&mtd_dev);
diff --git a/target/linux/brcm63xx/patches-2.6.39/141-led_count.patch
b/target/linux/brcm63xx/patches-3.0/141-led_count.patch
similarity index 83%
copy from target/linux/brcm63xx/patches-2.6.39/141-led_count.patch
copy to target/linux/brcm63xx/patches-3.0/141-led_count.patch
index baf0920..582f868 100644
--- a/target/linux/brcm63xx/patches-2.6.39/141-led_count.patch
+++ b/target/linux/brcm63xx/patches-3.0/141-led_count.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -881,6 +881,7 @@ int __init board_register_devices(void)
+@@ -893,6 +893,7 @@ int __init board_register_devices(void)
{
u32 val;
int button_count = 0;
@@ -8,7 +8,7 @@
if (board.has_uart0)
bcm63xx_uart_register(0);
-@@ -922,7 +923,11 @@ int __init board_register_devices(void)
+@@ -934,7 +935,11 @@ int __init board_register_devices(void)
platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
diff --git
a/target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch
b/target/linux/brcm63xx/patches-3.0/180-udc_preliminary_support.patch
similarity index 99%
copy from target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch
copy to target/linux/brcm63xx/patches-3.0/180-udc_preliminary_support.patch
index 7b341b7..1cc259b 100644
--- a/target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch
+++ b/target/linux/brcm63xx/patches-3.0/180-udc_preliminary_support.patch
@@ -17,7 +17,7 @@
};
static struct board_info __initdata board_rta1025w_16 = {
-@@ -909,6 +912,9 @@ int __init board_register_devices(void)
+@@ -921,6 +924,9 @@ int __init board_register_devices(void)
if (board.has_dsp)
bcm63xx_dsp_register(&board.dsp);
diff --git
a/target/linux/brcm63xx/patches-2.6.38/200-extended-platform-devices.patch
b/target/linux/brcm63xx/patches-3.0/200-extended-platform-devices.patch
similarity index 91%
copy from
target/linux/brcm63xx/patches-2.6.38/200-extended-platform-devices.patch
copy to target/linux/brcm63xx/patches-3.0/200-extended-platform-devices.patch
index db2c22f..f02db1f 100644
--- a/target/linux/brcm63xx/patches-2.6.38/200-extended-platform-devices.patch
+++ b/target/linux/brcm63xx/patches-3.0/200-extended-platform-devices.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -915,6 +915,9 @@ int __init board_register_devices(void)
+@@ -927,6 +927,9 @@ int __init board_register_devices(void)
if (board.has_udc0)
bcm63xx_udc_register();
diff --git a/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
b/target/linux/brcm63xx/patches-3.0/200-spi-board-info.patch
similarity index 92%
copy from target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
copy to target/linux/brcm63xx/patches-3.0/200-spi-board-info.patch
index 761ac96..59ef0af 100644
--- a/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
+++ b/target/linux/brcm63xx/patches-3.0/200-spi-board-info.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -918,6 +918,9 @@ int __init board_register_devices(void)
+@@ -930,6 +930,9 @@ int __init board_register_devices(void)
if (board.num_devs)
platform_add_devices(board.devs, board.num_devs);
diff --git
a/target/linux/brcm63xx/patches-2.6.39/210-no_ehci_over_current_check.patch
b/target/linux/brcm63xx/patches-3.0/210-no_ehci_over_current_check.patch
similarity index 88%
copy from
target/linux/brcm63xx/patches-2.6.39/210-no_ehci_over_current_check.patch
copy to target/linux/brcm63xx/patches-3.0/210-no_ehci_over_current_check.patch
index cfdf165..f2c10da 100644
--- a/target/linux/brcm63xx/patches-2.6.39/210-no_ehci_over_current_check.patch
+++ b/target/linux/brcm63xx/patches-3.0/210-no_ehci_over_current_check.patch
@@ -1,6 +1,6 @@
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
-@@ -883,11 +883,13 @@ static int ehci_hub_control (
+@@ -891,11 +891,13 @@ static int ehci_hub_control (
* power switching; they're allowed to just limit the
* current. khubd will turn the power back on.
*/
diff --git a/target/linux/brcm63xx/patches-2.6.39/220-wl_exports.patch
b/target/linux/brcm63xx/patches-3.0/220-wl_exports.patch
similarity index 94%
copy from target/linux/brcm63xx/patches-2.6.39/220-wl_exports.patch
copy to target/linux/brcm63xx/patches-3.0/220-wl_exports.patch
index 8cd87b8..2e43006 100644
--- a/target/linux/brcm63xx/patches-2.6.39/220-wl_exports.patch
+++ b/target/linux/brcm63xx/patches-3.0/220-wl_exports.patch
@@ -14,7 +14,7 @@
* known 6338 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6338
-@@ -747,6 +754,7 @@ void __init board_prom_init(void)
+@@ -758,6 +765,7 @@ void __init board_prom_init(void)
/* extract nvram data */
memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
diff --git
a/target/linux/brcm63xx/patches-2.6.38/230-6358-enet1-external-mii-clk.patch
b/target/linux/brcm63xx/patches-3.0/230-6358-enet1-external-mii-clk.patch
similarity index 93%
copy from
target/linux/brcm63xx/patches-2.6.38/230-6358-enet1-external-mii-clk.patch
copy to target/linux/brcm63xx/patches-3.0/230-6358-enet1-external-mii-clk.patch
index d859410..58fa709 100644
--- a/target/linux/brcm63xx/patches-2.6.38/230-6358-enet1-external-mii-clk.patch
+++ b/target/linux/brcm63xx/patches-3.0/230-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
-@@ -818,6 +818,8 @@ void __init board_prom_init(void)
+@@ -829,6 +829,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-2.6.39/240-spi.patch
b/target/linux/brcm63xx/patches-3.0/240-spi.patch
similarity index 99%
copy from target/linux/brcm63xx/patches-2.6.39/240-spi.patch
copy to target/linux/brcm63xx/patches-3.0/240-spi.patch
index d882c21..a567a7d 100644
--- a/target/linux/brcm63xx/patches-2.6.39/240-spi.patch
+++ b/target/linux/brcm63xx/patches-3.0/240-spi.patch
@@ -833,7 +833,7 @@
depends on BLACKFIN
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
-@@ -55,6 +55,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci.
+@@ -56,6 +56,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci.
obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o
obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o
obj-$(CONFIG_SPI_NUC900) += spi_nuc900.o
@@ -990,7 +990,7 @@
#include <board_bcm963xx.h>
#define PFX "board_bcm963xx: "
-@@ -931,6 +932,9 @@ int __init board_register_devices(void)
+@@ -943,6 +944,9 @@ int __init board_register_devices(void)
if (board.num_spis)
spi_register_board_info(board.spis, board.num_spis);
diff --git a/target/linux/brcm63xx/patches-2.6.38/250-boardid_fixup.patch
b/target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch
similarity index 92%
copy from target/linux/brcm63xx/patches-2.6.38/250-boardid_fixup.patch
copy to target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch
index 50e8016..36a5805 100644
--- a/target/linux/brcm63xx/patches-2.6.38/250-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.0/250-boardid_fixup.patch
@@ -14,7 +14,7 @@
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
-@@ -723,6 +727,29 @@ static int board_get_mac_address(u8 *mac
+@@ -734,6 +738,29 @@ static int board_get_mac_address(u8 *mac
return 0;
}
@@ -44,7 +44,7 @@
/*
* early init callback, read nvram data from flash and checksum it
*/
-@@ -771,6 +798,11 @@ void __init board_prom_init(void)
+@@ -782,6 +809,11 @@ void __init board_prom_init(void)
return;
}
diff --git a/target/linux/brcm63xx/patches-2.6.37/300-alice_gate2_leds.patch
b/target/linux/brcm63xx/patches-3.0/300-alice_gate2_leds.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/300-alice_gate2_leds.patch
copy to target/linux/brcm63xx/patches-3.0/300-alice_gate2_leds.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/310-96348gw_a_leds.patch
b/target/linux/brcm63xx/patches-3.0/310-96348gw_a_leds.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/310-96348gw_a_leds.patch
copy to target/linux/brcm63xx/patches-3.0/310-96348gw_a_leds.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/440-board-D4PW.patch
b/target/linux/brcm63xx/patches-3.0/440-board-D4PW.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/440-board-D4PW.patch
copy to target/linux/brcm63xx/patches-3.0/440-board-D4PW.patch
diff --git a/target/linux/brcm63xx/patches-2.6.39/441-board-NB4.patch
b/target/linux/brcm63xx/patches-3.0/441-board-NB4.patch
similarity index 99%
copy from target/linux/brcm63xx/patches-2.6.39/441-board-NB4.patch
copy to target/linux/brcm63xx/patches-3.0/441-board-NB4.patch
index 2fb7ff2..8dec892 100644
--- a/target/linux/brcm63xx/patches-2.6.39/441-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.0/441-board-NB4.patch
@@ -557,7 +557,7 @@
/*
* Register a sane SPROMv2 to make the on-board
* bcm4318 WLAN work
-@@ -959,6 +1485,9 @@ void __init board_prom_init(void)
+@@ -970,6 +1496,9 @@ void __init board_prom_init(void)
boardid_fixup(boot_addr);
}
diff --git a/target/linux/brcm63xx/patches-2.6.37/442-board-96338W2_E7T.patch
b/target/linux/brcm63xx/patches-3.0/442-board-96338W2_E7T.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/442-board-96338W2_E7T.patch
copy to target/linux/brcm63xx/patches-3.0/442-board-96338W2_E7T.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/443-board-CPVA642.patch
b/target/linux/brcm63xx/patches-3.0/443-board-CPVA642.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/443-board-CPVA642.patch
copy to target/linux/brcm63xx/patches-3.0/443-board-CPVA642.patch
diff --git
a/target/linux/brcm63xx/patches-2.6.37/444-board_dsl_274xb_rev_c.patch
b/target/linux/brcm63xx/patches-3.0/444-board_dsl_274xb_rev_c.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/444-board_dsl_274xb_rev_c.patch
copy to target/linux/brcm63xx/patches-3.0/444-board_dsl_274xb_rev_c.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/445-board_spw500v.patch
b/target/linux/brcm63xx/patches-3.0/445-board_spw500v.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/445-board_spw500v.patch
copy to target/linux/brcm63xx/patches-3.0/445-board_spw500v.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/447-board_gw6200_gw6000.patch
b/target/linux/brcm63xx/patches-3.0/447-board_gw6200_gw6000.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/447-board_gw6200_gw6000.patch
copy to target/linux/brcm63xx/patches-3.0/447-board_gw6200_gw6000.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/448-board-MAGIC.patch
b/target/linux/brcm63xx/patches-3.0/448-board-MAGIC.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/448-board-MAGIC.patch
copy to target/linux/brcm63xx/patches-3.0/448-board-MAGIC.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/449-board_hw553.patch
b/target/linux/brcm63xx/patches-3.0/449-board_hw553.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/449-board_hw553.patch
copy to target/linux/brcm63xx/patches-3.0/449-board_hw553.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/450-board_rta1320_16m.patch
b/target/linux/brcm63xx/patches-3.0/450-board_rta1320_16m.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/450-board_rta1320_16m.patch
copy to target/linux/brcm63xx/patches-3.0/450-board_rta1320_16m.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/451-board_spw303v.patch
b/target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/451-board_spw303v.patch
copy to target/linux/brcm63xx/patches-3.0/451-board_spw303v.patch
diff --git a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
b/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
similarity index 95%
copy from target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
copy to target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
index 4b483d4..210008a 100644
--- a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
@@ -72,7 +72,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2057,6 +2115,22 @@ void __init board_prom_init(void)
+@@ -2068,6 +2126,22 @@ void __init board_prom_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
@@ -95,7 +95,7 @@
/* dump cfe version */
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2264,6 +2338,14 @@ int __init board_register_devices(void)
+@@ -2276,6 +2350,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/453-board_BTV2110.patch
b/target/linux/brcm63xx/patches-3.0/453-board_BTV2110.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/453-board_BTV2110.patch
copy to target/linux/brcm63xx/patches-3.0/453-board_BTV2110.patch
diff --git a/target/linux/brcm63xx/patches-2.6.39/454-board_livebox.patch
b/target/linux/brcm63xx/patches-3.0/454-board_livebox.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.39/454-board_livebox.patch
copy to target/linux/brcm63xx/patches-3.0/454-board_livebox.patch
diff --git a/target/linux/brcm63xx/patches-2.6.37/455-board_ct536_ct5621.patch
b/target/linux/brcm63xx/patches-3.0/455-board_ct536_ct5621.patch
similarity index 100%
copy from target/linux/brcm63xx/patches-2.6.37/455-board_ct536_ct5621.patch
copy to target/linux/brcm63xx/patches-3.0/455-board_ct536_ct5621.patch
diff --git
a/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch
b/target/linux/brcm63xx/patches-3.0/977-ssb_export_fallback_sprom.patch
similarity index 100%
copy from
target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch
copy to target/linux/brcm63xx/patches-3.0/977-ssb_export_fallback_sprom.patch
--
1.7.2.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
