KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bcm63xx: remove bcm_tag usage in kernel

Browse source 
Fixes #12292.

SVN-Revision: 33670
This commit is contained in:
Jonas Gorski 2012-10-09 08:08:49 +00:00
parent 8086b7a750
commit fbe0af3237
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
View file

@ -4,7 +4,7 @@
#include <bcm63xx_dev_pcmcia.h> #include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_spi.h> #include <bcm63xx_dev_spi.h>
#include <board_bcm963xx.h> #include <board_bcm963xx.h>
+#include <bcm_tag.h> +#include <bcm963xx_tag.h>
#define PFX "board_bcm963xx: " #define PFX "board_bcm963xx: "
@ -26,10 +26,10 @@
+ struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K); + struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
+ +
+ /* check if bcm_tag is at 64k offset */ + /* check if bcm_tag is at 64k offset */
+ if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { + if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
+ /* else try 128k */ + /* else try 128k */
+ tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K); + tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
+ if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { + if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
+ /* No tag found */ + /* No tag found */
+ printk(KERN_DEBUG "No bcm_tag found!\n"); + printk(KERN_DEBUG "No bcm_tag found!\n");
+ return; + return;

2
target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch
View file

@ -67,7 +67,7 @@ Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device.
#include <bcm63xx_dev_spi.h> #include <bcm63xx_dev_spi.h>
+#include <bcm63xx_dev_usb_ohci.h> +#include <bcm63xx_dev_usb_ohci.h>
#include <board_bcm963xx.h> #include <board_bcm963xx.h>
#include <bcm_tag.h> #include <bcm963xx_tag.h>
@@ -916,6 +917,9 @@ int __init board_register_devices(void) @@ -916,6 +917,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr)) !board_get_mac_address(board.enet1.mac_addr))

2
target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch
View file

@ -49,7 +49,7 @@ Subject: [PATCH 26/63] MIPS: BCM63XX: register ehci device.
#include <bcm63xx_dev_usb_ohci.h> #include <bcm63xx_dev_usb_ohci.h>
+#include <bcm63xx_dev_usb_ehci.h> +#include <bcm63xx_dev_usb_ehci.h>
#include <board_bcm963xx.h> #include <board_bcm963xx.h>
#include <bcm_tag.h> #include <bcm963xx_tag.h>
@@ -917,6 +918,9 @@ int __init board_register_devices(void) @@ -917,6 +918,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr)) !board_get_mac_address(board.enet1.mac_addr))

8
target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
View file

@ -91,12 +91,12 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+ char *board_name = (char *)bcm63xx_nvram_get_name(); + char *board_name = (char *)bcm63xx_nvram_get_name();
/* check if bcm_tag is at 64k offset */ /* check if bcm_tag is at 64k offset */
- if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { - if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
+ if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) { + if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
/* else try 128k */ /* else try 128k */
tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K); tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
- if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) { - if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
+ if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) { + if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
/* No tag found */ /* No tag found */
printk(KERN_DEBUG "No bcm_tag found!\n"); printk(KERN_DEBUG "No bcm_tag found!\n");
return; return;

2
target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
View file

@ -13,7 +13,7 @@ Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
#include <bcm63xx_dev_usb_ehci.h> #include <bcm63xx_dev_usb_ehci.h>
#include <board_bcm963xx.h> #include <board_bcm963xx.h>
#include <bcm_tag.h> #include <bcm963xx_tag.h>
+#include <pci_ath9k_fixup.h> +#include <pci_ath9k_fixup.h>
#define PFX "board_bcm963xx: " #define PFX "board_bcm963xx: "

2
target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
View file

@ -636,5 +636,5 @@
+ } + }
+ +
/* check if bcm_tag is at 64k offset */ /* check if bcm_tag is at 64k offset */
if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) { if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
/* else try 128k */ /* else try 128k */

2
target/linux/brcm63xx/patches-3.3/528-board_nb6.patch
View file

@ -142,5 +142,5 @@
+ } + }
+ +
/* check if bcm_tag is at 64k offset */ /* check if bcm_tag is at 64k offset */
if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) { if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
/* else try 128k */ /* else try 128k */