aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:38 +0000
committerJonas Gorski <jogo@openwrt.org>2014-06-21 19:23:38 +0000
commit43cc8c3ebec4658963d44a6108f8f74e8ccdbb54 (patch)
tree5e1eda807e353fc17f5fa4da15611b58d7524833 /target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
parent21d65bb185225a3a5369756fc44acbbbfbc2f651 (diff)
downloadupstream-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.gz
upstream-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.tar.bz2
upstream-43cc8c3ebec4658963d44a6108f8f74e8ccdbb54.zip
brcm63xx: allow bcm963xx and livebox support at the same time
Use the CFE_EPTSEAL to tell them apart at runtime. Added for now only for the 3.14 until properly tested. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41296
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
index 447c17df18..32c20c85ce 100644
--- a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -629,6 +629,8 @@ static struct board_info __initdata boar
+@@ -598,6 +598,8 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
@@ -9,7 +9,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -672,6 +674,8 @@ static struct board_info __initdata boar
+@@ -641,6 +643,8 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
@@ -18,7 +18,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -957,6 +961,8 @@ static struct board_info __initdata boar
+@@ -926,6 +930,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@@ -27,7 +27,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1029,6 +1035,8 @@ static struct board_info __initdata boar
+@@ -998,6 +1004,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@@ -36,7 +36,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1258,6 +1266,8 @@ static struct board_info __initdata boar
+@@ -1245,6 +1253,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@@ -45,7 +45,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1433,6 +1443,8 @@ static struct board_info __initdata boar
+@@ -1420,6 +1430,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@@ -54,7 +54,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1623,6 +1635,8 @@ static struct board_info __initdata boar
+@@ -1610,6 +1622,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@@ -63,7 +63,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1644,6 +1658,8 @@ static struct board_info __initdata boar
+@@ -1631,6 +1645,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@@ -72,7 +72,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -1663,6 +1679,8 @@ static struct board_info __initdata boar
+@@ -1650,6 +1666,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@@ -81,7 +81,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2038,6 +2056,8 @@ static struct board_info __initdata boar
+@@ -2025,6 +2043,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@@ -90,7 +90,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2090,6 +2110,8 @@ static struct board_info __initdata boar
+@@ -2077,6 +2097,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@@ -99,7 +99,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2231,6 +2253,8 @@ static struct board_info __initdata boar
+@@ -2218,6 +2240,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@@ -108,7 +108,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -2348,6 +2372,8 @@ static struct board_info __initdata boar
+@@ -2335,6 +2359,8 @@ static struct board_info __initdata boar
},
.enet1 = {