summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-09 08:08:49 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-09 08:08:49 +0000
commit361733d48caeb93076f77c89ec985fae1df953d0 (patch)
tree93041de6f3b70dce7d2407a11231a35fd8e3d8ce /target/linux
parent20f4a947e082de6c525539b973d47c0a1767a59e (diff)
bcm63xx: remove bcm_tag usage in kernel
Fixes #12292. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33670 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch6
-rw-r--r--target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch8
-rw-r--r--target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/501-board-NB4.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/528-board_nb6.patch2
7 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
index 0c2fab575..3b9e23ef7 100644
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
@@ -4,7 +4,7 @@
#include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_spi.h>
#include <board_bcm963xx.h>
-+#include <bcm_tag.h>
++#include <bcm963xx_tag.h>
#define PFX "board_bcm963xx: "
@@ -26,10 +26,10 @@
+ struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
+
+ /* 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 */
+ 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 */
+ printk(KERN_DEBUG "No bcm_tag found!\n");
+ return;
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 27ecc5a8b..33b1a3935 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
@@ -67,7 +67,7 @@ Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device.
#include <bcm63xx_dev_spi.h>
+#include <bcm63xx_dev_usb_ohci.h>
#include <board_bcm963xx.h>
- #include <bcm_tag.h>
+ #include <bcm963xx_tag.h>
@@ -916,6 +917,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
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 cd5eb73ce..d6773d565 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 <bcm63xx_dev_usb_ohci.h>
+#include <bcm63xx_dev_usb_ehci.h>
#include <board_bcm963xx.h>
- #include <bcm_tag.h>
+ #include <bcm963xx_tag.h>
@@ -917,6 +918,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
diff --git a/target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch b/target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
index ff2a831d8..8ebbdb737 100644
--- a/target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
+++ b/target/linux/brcm63xx/patches-3.3/428-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
@@ -91,12 +91,12 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+ char *board_name = (char *)bcm63xx_nvram_get_name();
/* check if bcm_tag is at 64k offset */
-- if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) {
-+ if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) {
+- if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
++ if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
/* else try 128k */
tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
-- if (strncmp(nvram.name, tag->boardid, BOARDID_LEN) != 0) {
-+ if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) {
+- if (strncmp(nvram.name, tag->board_id, BOARDID_LEN) != 0) {
++ if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
/* No tag found */
printk(KERN_DEBUG "No bcm_tag found!\n");
return;
diff --git a/target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
index 742d11566..e0e4a4738 100644
--- a/target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
+++ b/target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
@@ -13,7 +13,7 @@ Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
@@ -33,6 +33,7 @@
#include <bcm63xx_dev_usb_ehci.h>
#include <board_bcm963xx.h>
- #include <bcm_tag.h>
+ #include <bcm963xx_tag.h>
+#include <pci_ath9k_fixup.h>
#define PFX "board_bcm963xx: "
diff --git a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
index 2f96f4b1e..0f4c26a0b 100644
--- a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
@@ -636,5 +636,5 @@
+ }
+
/* 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 */
diff --git a/target/linux/brcm63xx/patches-3.3/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.3/528-board_nb6.patch
index e3f9382c0..58bd3efb7 100644
--- a/target/linux/brcm63xx/patches-3.3/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.3/528-board_nb6.patch
@@ -142,5 +142,5 @@
+ }
+
/* 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 */