aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-06-05 13:40:41 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-06-05 13:40:41 +0000
commit9f6ef16bdc7b4da0ce9501c08b942df0a86cff0a (patch)
tree088b2eefa7878020596d936533d189f7a2fd7a9f /target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
parent18ad7d53f31918288511d5b7a71ca4be5e7a7aab (diff)
downloadmaster-187ad058-9f6ef16bdc7b4da0ce9501c08b942df0a86cff0a.tar.gz
master-187ad058-9f6ef16bdc7b4da0ce9501c08b942df0a86cff0a.tar.bz2
master-187ad058-9f6ef16bdc7b4da0ce9501c08b942df0a86cff0a.zip
[brcm63xx] fix board patches so that new boards are withing appropriate ifdef
Some new board definitions were added within the #ifdef CONFIG_CPU_6338 section while some other were added within #ifdef CONFIG_CPU_6345, fix this git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32060 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
index 274afe12a4..63d9e14d7e 100644
--- a/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
@@ -1,12 +1,13 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -250,6 +250,76 @@ static struct board_info __initdata boar
+@@ -724,6 +724,76 @@ static struct board_info __initdata boar
+ },
},
};
-
++
+static struct board_info __initdata board_96348sv = {
+ .name = "MAGIC",
-+ .expected_cpu_id = 0x6348,
++ .expected_cpu_id = 0x6348,
+
+ .has_uart0 = 1,
+ .has_enet0 = 1,
@@ -14,11 +15,11 @@
+ .has_pci = 1,
+
+ .enet0 = {
-+ .has_phy = 1,
++ .has_phy = 1,
+ .use_internal_phy = 1,
+ },
+ .enet1 = {
-+ /* is has BP_ENET_EXTERNAL_PHY */
++ /* it has BP_ENET_EXTERNAL_PHY */
+ .force_speed_100 = 1,
+ .force_duplex_full = 1,
+ },
@@ -31,7 +32,7 @@
+ .dsp = {
+ .gpio_rst = 25,
+ .gpio_int = 34,
-+ .cs = 2,
++ .cs = 2,
+ .ext_irq = 2,
+ },
+
@@ -73,11 +74,10 @@
+ },
+ },
+};
-+
#endif
/*
-@@ -1536,6 +1606,7 @@ static const struct board_info __initdat
+@@ -1535,6 +1605,7 @@ static const struct board_info __initdat
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,