Changeset 35605


Ignore:
Timestamp:
2013-02-15T13:23:49+01:00 (5 years ago)
Author:
jogo
Message:

bcm63xx: make nvram checksum failures non fatal

fixes #12982.

Signed-off-by: Jonas Gorski <jogo@…>

Location:
trunk/target/linux/brcm63xx
Files:
2 added
2 deleted
36 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/patches-3.7/300-reset_buttons.patch

    r35481 r35605  
    5454  
    5555 static struct board_info __initdata board_FAST2404 = { 
    56 @@ -826,11 +851,23 @@ static struct platform_device bcm63xx_gp 
     56@@ -823,11 +848,23 @@ static struct platform_device bcm63xx_gp 
    5757        .dev.platform_data      = &bcm63xx_led_data, 
    5858 }; 
     
    7878                bcm63xx_uart_register(0); 
    7979  
    80 @@ -876,5 +913,16 @@ int __init board_register_devices(void) 
     80@@ -873,5 +910,16 @@ int __init board_register_devices(void) 
    8181  
    8282        platform_device_register(&bcm63xx_gpio_leds); 
  • trunk/target/linux/brcm63xx/patches-3.7/301-led_count.patch

    r35481 r35605  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -867,6 +867,7 @@ static struct platform_device bcm63xx_gp 
     3@@ -864,6 +864,7 @@ static struct platform_device bcm63xx_gp 
    44 int __init board_register_devices(void) 
    55 { 
     
    99        if (board.has_uart0) 
    1010                bcm63xx_uart_register(0); 
    11 @@ -908,10 +909,16 @@ int __init board_register_devices(void) 
     11@@ -905,10 +906,16 @@ int __init board_register_devices(void) 
    1212  
    1313        bcm63xx_flash_register(); 
  • trunk/target/linux/brcm63xx/patches-3.7/302-extended-platform-devices.patch

    r35481 r35605  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -907,6 +907,9 @@ int __init board_register_devices(void) 
     3@@ -904,6 +904,9 @@ int __init board_register_devices(void) 
    44  
    55        bcm63xx_spi_register(); 
  • trunk/target/linux/brcm63xx/patches-3.7/303-spi-board-info.patch

    r35481 r35605  
    99 #include <bcm63xx_board.h> 
    1010 #include <bcm63xx_cpu.h> 
    11 @@ -910,6 +911,9 @@ int __init board_register_devices(void) 
     11@@ -907,6 +908,9 @@ int __init board_register_devices(void) 
    1212        if (board.num_devs) 
    1313                platform_add_devices(board.devs, board.num_devs); 
  • trunk/target/linux/brcm63xx/patches-3.7/304-boardid_fixup.patch

    r35481 r35605  
    4949  * early init callback, read nvram data from flash and checksum it 
    5050  */ 
    51 @@ -776,6 +805,11 @@ void __init board_prom_init(void) 
    52                 return; 
    53         } 
     51@@ -773,6 +802,11 @@ void __init board_prom_init(void) 
     52  
     53        bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET); 
    5454  
    5555+       if (strcmp(cfe_version, "unknown") != 0) { 
  • trunk/target/linux/brcm63xx/patches-3.7/401-MIPS-BCM63XX-register-ohci-device.patch

    r35481 r35605  
    7272 #include <board_bcm963xx.h> 
    7373  
    74 @@ -926,6 +927,9 @@ int __init board_register_devices(void) 
     74@@ -923,6 +924,9 @@ int __init board_register_devices(void) 
    7575        if (board.has_usbd) 
    7676                bcm63xx_usbd_register(&board.usbd); 
  • trunk/target/linux/brcm63xx/patches-3.7/403-MIPS-BCM63XX-register-ehci-device.patch

    r35481 r35605  
    5353 #include <board_bcm963xx.h> 
    5454  
    55 @@ -927,6 +928,9 @@ int __init board_register_devices(void) 
     55@@ -924,6 +925,9 @@ int __init board_register_devices(void) 
    5656        if (board.has_usbd) 
    5757                bcm63xx_usbd_register(&board.usbd); 
  • trunk/target/linux/brcm63xx/patches-3.7/408-6358-enet1-external-mii-clk.patch

    r35481 r35605  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -862,6 +862,8 @@ void __init board_prom_init(void) 
     3@@ -859,6 +859,8 @@ void __init board_prom_init(void) 
    44                if (BCMCPU_IS_6348()) 
    55                        val |= GPIO_MODE_6348_G3_EXT_MII | 
  • trunk/target/linux/brcm63xx/patches-3.7/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch

    r35481 r35605  
    1414--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    1515+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    16 @@ -930,6 +930,10 @@ int __init board_register_devices(void) 
     16@@ -927,6 +927,10 @@ int __init board_register_devices(void) 
    1717        if (board.has_usbd) 
    1818                bcm63xx_usbd_register(&board.usbd); 
  • trunk/target/linux/brcm63xx/patches-3.7/425-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch

    r35481 r35605  
    3737 #include <bcm63xx_dev_spi.h> 
    3838 #include <bcm63xx_dev_usb_ohci.h> 
    39 @@ -955,6 +956,7 @@ int __init board_register_devices(void) 
     39@@ -952,6 +953,7 @@ int __init board_register_devices(void) 
    4040                        pr_err(PFX "failed to register fallback SPROM\n"); 
    4141        } 
  • trunk/target/linux/brcm63xx/patches-3.7/429-MIPS-BCM63XX-export-PSI-size-from-nvram.patch

    r35533 r35605  
    2121 static int mac_addr_used; 
    2222  
    23 @@ -121,3 +123,12 @@ int bcm63xx_nvram_get_mac_address(u8 *ma 
     23@@ -104,3 +106,12 @@ int bcm63xx_nvram_get_mac_address(u8 *ma 
    2424        return 0; 
    2525 } 
     
    3636--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h 
    3737+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h 
    38 @@ -32,4 +32,6 @@ u8 *bcm63xx_nvram_get_name(void); 
     38@@ -30,4 +30,6 @@ u8 *bcm63xx_nvram_get_name(void); 
    3939  */ 
    4040 int bcm63xx_nvram_get_mac_address(u8 *mac); 
  • trunk/target/linux/brcm63xx/patches-3.7/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch

    r35481 r35605  
    1919 #include <uapi/linux/bcm963xx_tag.h> 
    2020  
    21 @@ -910,6 +911,7 @@ int __init board_register_devices(void) 
     21@@ -907,6 +908,7 @@ int __init board_register_devices(void) 
    2222 { 
    2323        int button_count = 0; 
     
    2727        if (board.has_uart0) 
    2828                bcm63xx_uart_register(0); 
    29 @@ -948,7 +950,8 @@ int __init board_register_devices(void) 
     29@@ -945,7 +947,8 @@ int __init board_register_devices(void) 
    3030         * do this after registering enet devices 
    3131         */ 
     
    3737                memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); 
    3838                if (ssb_arch_register_fallback_sprom( 
    39 @@ -990,5 +993,9 @@ int __init board_register_devices(void) 
     39@@ -987,5 +990,9 @@ int __init board_register_devices(void) 
    4040                platform_device_register(&bcm63xx_gpio_keys_device); 
    4141        } 
  • trunk/target/linux/brcm63xx/patches-3.7/437-MIPS-BCM63XX-pass-caldata-info-to-flash.patch

    r35481 r35605  
    1212--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    1313+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    14 @@ -969,7 +969,7 @@ int __init board_register_devices(void) 
     14@@ -966,7 +966,7 @@ int __init board_register_devices(void) 
    1515        if (board.num_spis) 
    1616                spi_register_board_info(board.spis, board.num_spis); 
  • trunk/target/linux/brcm63xx/patches-3.7/444-BCM63XX-add-endian-check-for-ath9k.patch

    r35481 r35605  
    4242--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    4343+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    44 @@ -995,7 +995,8 @@ int __init board_register_devices(void) 
     44@@ -992,7 +992,8 @@ int __init board_register_devices(void) 
    4545  
    4646        /* register any fixups */ 
  • trunk/target/linux/brcm63xx/patches-3.7/445-BCM63XX-add-led-pin-for-ath9k.patch

    r35481 r35605  
    33--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    44+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    5 @@ -996,7 +996,7 @@ int __init board_register_devices(void) 
     5@@ -993,7 +993,7 @@ int __init board_register_devices(void) 
    66        /* register any fixups */ 
    77        for (i = 0; i < board.has_caldata; i++) 
  • trunk/target/linux/brcm63xx/patches-3.7/446-BCM63XX-add-a-fixup-for-rt2x00-devices.patch

    r35481 r35605  
    3737 #include <uapi/linux/bcm963xx_tag.h> 
    3838  
    39 @@ -994,9 +995,19 @@ int __init board_register_devices(void) 
     39@@ -991,9 +992,19 @@ int __init board_register_devices(void) 
    4040        } 
    4141  
  • trunk/target/linux/brcm63xx/patches-3.7/511-board_V2500V.patch

    r35481 r35605  
    8989+               u8 *tmp_boot_addr = (u8*)0xbfc00000; 
    9090+ 
    91 +               if (!bcm63xx_nvram_init(tmp_boot_addr + BCM963XX_NVRAM_OFFSET) && 
    92 +                   !strcmp(bcm63xx_nvram_get_name(), "V2500V_BB")) { 
     91+               bcm63xx_nvram_init(tmp_boot_addr + BCM963XX_NVRAM_OFFSET); 
     92+               if(!strcmp(bcm63xx_nvram_get_name(), "V2500V_BB")) { 
    9393+                       printk(KERN_INFO PFX "V2500V: nvram bank 0\n"); 
    9494+                       boot_addr = tmp_boot_addr; 
  • trunk/target/linux/brcm63xx/patches-3.7/520-bcm63xx-add-support-for-96368MVWG-board.patch

    r35481 r35605  
    101101  
    102102 /* 
    103 @@ -2412,12 +2488,25 @@ void __init board_prom_init(void) 
     103@@ -2409,12 +2485,25 @@ void __init board_prom_init(void) 
    104104                bcm63xx_pci_enabled = 1; 
    105105                if (BCMCPU_IS_6348()) 
  • trunk/target/linux/brcm63xx/patches-3.7/800-wl_exports.patch

    r35481 r35605  
    1212+EXPORT_SYMBOL(nvram_buf); 
    1313+ 
    14  int __init bcm63xx_nvram_init(void *addr) 
     14 void __init bcm63xx_nvram_init(void *addr) 
    1515 { 
    1616        unsigned int check_len; 
    17 @@ -47,6 +54,7 @@ int __init bcm63xx_nvram_init(void *addr 
     17@@ -47,6 +54,7 @@ void __init bcm63xx_nvram_init(void *add 
    1818  
    1919        /* extract nvram data */ 
  • trunk/target/linux/brcm63xx/patches-3.8/300-reset_buttons.patch

    r35482 r35605  
    5454  
    5555 static struct board_info __initdata board_FAST2404 = { 
    56 @@ -828,11 +853,23 @@ static struct platform_device bcm63xx_gp 
     56@@ -825,11 +850,23 @@ static struct platform_device bcm63xx_gp 
    5757        .dev.platform_data      = &bcm63xx_led_data, 
    5858 }; 
     
    7878                bcm63xx_uart_register(0); 
    7979  
    80 @@ -884,5 +921,16 @@ int __init board_register_devices(void) 
     80@@ -881,5 +918,16 @@ int __init board_register_devices(void) 
    8181  
    8282        platform_device_register(&bcm63xx_gpio_leds); 
  • trunk/target/linux/brcm63xx/patches-3.8/301-led_count.patch

    r35482 r35605  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -869,6 +869,7 @@ static struct platform_device bcm63xx_gp 
     3@@ -866,6 +866,7 @@ static struct platform_device bcm63xx_gp 
    44 int __init board_register_devices(void) 
    55 { 
     
    99        if (board.has_uart0) 
    1010                bcm63xx_uart_register(0); 
    11 @@ -916,10 +917,16 @@ int __init board_register_devices(void) 
     11@@ -913,10 +914,16 @@ int __init board_register_devices(void) 
    1212  
    1313        bcm63xx_flash_register(); 
  • trunk/target/linux/brcm63xx/patches-3.8/302-extended-platform-devices.patch

    r35482 r35605  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -915,6 +915,9 @@ int __init board_register_devices(void) 
     3@@ -912,6 +912,9 @@ int __init board_register_devices(void) 
    44  
    55        bcm63xx_spi_register(); 
  • trunk/target/linux/brcm63xx/patches-3.8/303-spi-board-info.patch

    r35482 r35605  
    99 #include <bcm63xx_board.h> 
    1010 #include <bcm63xx_cpu.h> 
    11 @@ -918,6 +919,9 @@ int __init board_register_devices(void) 
     11@@ -915,6 +916,9 @@ int __init board_register_devices(void) 
    1212        if (board.num_devs) 
    1313                platform_add_devices(board.devs, board.num_devs); 
  • trunk/target/linux/brcm63xx/patches-3.8/304-boardid_fixup.patch

    r35482 r35605  
    4949  * early init callback, read nvram data from flash and checksum it 
    5050  */ 
    51 @@ -778,6 +807,11 @@ void __init board_prom_init(void) 
    52                 return; 
    53         } 
     51@@ -775,6 +804,11 @@ void __init board_prom_init(void) 
     52  
     53        bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET); 
    5454  
    5555+       if (strcmp(cfe_version, "unknown") != 0) { 
  • trunk/target/linux/brcm63xx/patches-3.8/408-6358-enet1-external-mii-clk.patch

    r35482 r35605  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -862,6 +862,8 @@ void __init board_prom_init(void) 
     3@@ -859,6 +859,8 @@ void __init board_prom_init(void) 
    44                if (BCMCPU_IS_6348()) 
    55                        val |= GPIO_MODE_6348_G3_EXT_MII | 
  • trunk/target/linux/brcm63xx/patches-3.8/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch

    r35482 r35605  
    1414--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    1515+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    16 @@ -930,6 +930,10 @@ int __init board_register_devices(void) 
     16@@ -927,6 +927,10 @@ int __init board_register_devices(void) 
    1717        if (board.has_usbd) 
    1818                bcm63xx_usbd_register(&board.usbd); 
  • trunk/target/linux/brcm63xx/patches-3.8/425-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch

    r35482 r35605  
    3838 #include <bcm63xx_dev_spi.h> 
    3939 #include <bcm63xx_dev_usb_ehci.h> 
    40 @@ -955,6 +956,7 @@ int __init board_register_devices(void) 
     40@@ -952,6 +953,7 @@ int __init board_register_devices(void) 
    4141                        pr_err(PFX "failed to register fallback SPROM\n"); 
    4242        } 
  • trunk/target/linux/brcm63xx/patches-3.8/429-MIPS-BCM63XX-export-PSI-size-from-nvram.patch

    r35533 r35605  
    2121 static int mac_addr_used; 
    2222  
    23 @@ -121,3 +123,12 @@ int bcm63xx_nvram_get_mac_address(u8 *ma 
     23@@ -104,3 +106,12 @@ int bcm63xx_nvram_get_mac_address(u8 *ma 
    2424        return 0; 
    2525 } 
     
    3636--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h 
    3737+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h 
    38 @@ -32,4 +32,6 @@ u8 *bcm63xx_nvram_get_name(void); 
     38@@ -30,4 +30,6 @@ u8 *bcm63xx_nvram_get_name(void); 
    3939  */ 
    4040 int bcm63xx_nvram_get_mac_address(u8 *mac); 
  • trunk/target/linux/brcm63xx/patches-3.8/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch

    r35482 r35605  
    1919 #include <uapi/linux/bcm963xx_tag.h> 
    2020  
    21 @@ -910,6 +911,7 @@ int __init board_register_devices(void) 
     21@@ -907,6 +908,7 @@ int __init board_register_devices(void) 
    2222 { 
    2323        int button_count = 0; 
     
    2727        if (board.has_uart0) 
    2828                bcm63xx_uart_register(0); 
    29 @@ -948,7 +950,8 @@ int __init board_register_devices(void) 
     29@@ -945,7 +947,8 @@ int __init board_register_devices(void) 
    3030         * do this after registering enet devices 
    3131         */ 
     
    3737                memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); 
    3838                if (ssb_arch_register_fallback_sprom( 
    39 @@ -990,5 +993,9 @@ int __init board_register_devices(void) 
     39@@ -987,5 +990,9 @@ int __init board_register_devices(void) 
    4040                platform_device_register(&bcm63xx_gpio_keys_device); 
    4141        } 
  • trunk/target/linux/brcm63xx/patches-3.8/437-MIPS-BCM63XX-pass-caldata-info-to-flash.patch

    r35482 r35605  
    1212--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    1313+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    14 @@ -969,7 +969,7 @@ int __init board_register_devices(void) 
     14@@ -966,7 +966,7 @@ int __init board_register_devices(void) 
    1515        if (board.num_spis) 
    1616                spi_register_board_info(board.spis, board.num_spis); 
  • trunk/target/linux/brcm63xx/patches-3.8/444-BCM63XX-add-endian-check-for-ath9k.patch

    r35482 r35605  
    4040--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    4141+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    42 @@ -995,7 +995,8 @@ int __init board_register_devices(void) 
     42@@ -992,7 +992,8 @@ int __init board_register_devices(void) 
    4343  
    4444        /* register any fixups */ 
  • trunk/target/linux/brcm63xx/patches-3.8/445-BCM63XX-add-led-pin-for-ath9k.patch

    r35482 r35605  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -996,7 +996,7 @@ int __init board_register_devices(void) 
     3@@ -993,7 +993,7 @@ int __init board_register_devices(void) 
    44        /* register any fixups */ 
    55        for (i = 0; i < board.has_caldata; i++) 
  • trunk/target/linux/brcm63xx/patches-3.8/446-BCM63XX-add-a-fixup-for-rt2x00-devices.patch

    r35482 r35605  
    3737 #include <uapi/linux/bcm963xx_tag.h> 
    3838  
    39 @@ -994,9 +995,19 @@ int __init board_register_devices(void) 
     39@@ -991,9 +992,19 @@ int __init board_register_devices(void) 
    4040        } 
    4141  
  • trunk/target/linux/brcm63xx/patches-3.8/511-board_V2500V.patch

    r35482 r35605  
    8989+               u8 *tmp_boot_addr = (u8*)0xbfc00000; 
    9090+ 
    91 +               if (!bcm63xx_nvram_init(tmp_boot_addr + BCM963XX_NVRAM_OFFSET) && 
    92 +                   !strcmp(bcm63xx_nvram_get_name(), "V2500V_BB")) { 
     91+               bcm63xx_nvram_init(tmp_boot_addr + BCM963XX_NVRAM_OFFSET); 
     92+               if (!strcmp(bcm63xx_nvram_get_name(), "V2500V_BB")) { 
    9393+                       printk(KERN_INFO PFX "V2500V: nvram bank 0\n"); 
    9494+                       boot_addr = tmp_boot_addr; 
  • trunk/target/linux/brcm63xx/patches-3.8/520-bcm63xx-add-support-for-96368MVWG-board.patch

    r35482 r35605  
    101101  
    102102 /* 
    103 @@ -2412,12 +2488,25 @@ void __init board_prom_init(void) 
     103@@ -2409,12 +2485,25 @@ void __init board_prom_init(void) 
    104104                bcm63xx_pci_enabled = 1; 
    105105                if (BCMCPU_IS_6348()) 
  • trunk/target/linux/brcm63xx/patches-3.8/800-wl_exports.patch

    r35482 r35605  
    1212+EXPORT_SYMBOL(nvram_buf); 
    1313+ 
    14  int __init bcm63xx_nvram_init(void *addr) 
     14 void __init bcm63xx_nvram_init(void *addr) 
    1515 { 
    1616        unsigned int check_len; 
    17 @@ -47,6 +54,7 @@ int __init bcm63xx_nvram_init(void *addr 
     17@@ -47,6 +54,7 @@ void __init bcm63xx_nvram_init(void *add 
    1818  
    1919        /* extract nvram data */ 
Note: See TracChangeset for help on using the changeset viewer.