From aee666d8f9bd92bd8ebd7ec53631f4d5a6d36fba Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 12 Jul 2014 12:31:30 +0000 Subject: [PATCH] brcm63xx: Use model name for ADB P.DG A4001N1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch also makes use of the new leds script. Signed-off-by: Álvaro Fernández Rojas Signed-off-by: Jonas Gorski SVN-Revision: 41585 --- .../base-files/etc/uci-defaults/01_leds | 8 ++++-- .../linux/brcm63xx/base-files/lib/brcm63xx.sh | 2 +- target/linux/brcm63xx/image/Makefile | 3 +- ...281T_TEF.patch => 530-board_A4001N1.patch} | 28 +++++++++---------- .../531-board_96328A-1441N1.patch | 2 +- .../patches-3.10/532-board_96328a-1241N.patch | 2 +- .../patches-3.10/536-board_fast2704.patch | 2 +- ...281T_TEF.patch => 530-board_A4001N1.patch} | 28 +++++++++---------- .../531-board_96328A-1441N1.patch | 2 +- .../patches-3.14/532-board_96328a-1241N.patch | 2 +- .../patches-3.14/536-board_fast2704.patch | 2 +- 11 files changed, 42 insertions(+), 39 deletions(-) rename target/linux/brcm63xx/patches-3.10/{530-board_963281T_TEF.patch => 530-board_A4001N1.patch} (79%) rename target/linux/brcm63xx/patches-3.14/{530-board_963281T_TEF.patch => 530-board_A4001N1.patch} (79%) diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds index 6007e38218..ae7ed96093 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds @@ -1,14 +1,16 @@ #!/bin/sh # -# Copyright (C) 2013 OpenWrt.org +# Copyright (C) 2013-2014 OpenWrt.org # - . /lib/functions/uci-defaults.sh . /lib/brcm63xx.sh - case "$board_name" in +963281T_TEF) + ucidef_set_led_netdev "lan" "LAN" "A4001N1:green:eth" "eth0" + ucidef_set_led_usbdev "usb" "USB" "A4001N1:green:3g" "1-1" + ;; 'F@ST2704V2') ucidef_set_led_usbdev "usb" "USB" "F@ST2704V2:green:usb" "1-1" ;; diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index c6b2d20540..afacffcd9a 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -54,7 +54,7 @@ brcm63xx_detect() { ;; 963281T_TEF) brcm63xx_has_reset_button="true" - status_led="963281T_TEF:green:power" + status_led="A4001N1:green:power" ifname=eth0 ;; 96348GW) diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index e0c77b675b..711c80219a 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -173,7 +173,6 @@ define Image/Build $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-4M-flash-generic,,--pad 2) $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-8M-flash-generic,,--pad 4) $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-16M-flash-generic,,--pad 8) - $(call Image/Build/CFE,$(1),963281T_TEF,6328,963281T_TEF-generic,,--pad 8) $(call Image/Build/CFE,$(1),96345GW2,6345,96345GW2-generic) $(call Image/Build/CFE,$(1),96345GW2,6345,96348GW2-bc221,,--layoutver 5) $(call Image/Build/CFE,$(1),96345GW2,6345,92345GW2-rev,OpenWRT-$(REVISION)) @@ -190,6 +189,8 @@ define Image/Build $(call Image/Build/CFE,$(1),96368MVNgr,6368,96368MVNgr-generic) $(call Image/Build/CFE,$(1),96368MVWG,6368,96368MVWG-generic) + # ADB P.DG A4001N1 + $(call Image/Build/CFE,$(1),963281T_TEF,6328,A4001N1,,--pad 8) # Asmax AR 1004g $(call Image/Build/CFEFIXUP,$(1),96348GW-10,AR1004G,6348,AR1004G) # BT Voyager V210_BTR diff --git a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.10/530-board_A4001N1.patch similarity index 79% rename from target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch rename to target/linux/brcm63xx/patches-3.10/530-board_A4001N1.patch index 134cff6c9c..ea2cb1d3bf 100644 --- a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch +++ b/target/linux/brcm63xx/patches-3.10/530-board_A4001N1.patch @@ -4,7 +4,7 @@ }, }; -+static struct board_info __initdata board_963281T_TEF = { ++static struct board_info __initdata board_A4001N1 = { + .name = "963281T_TEF", + .expected_cpu_id = 0x6328, + @@ -42,63 +42,63 @@ + + .leds = { + { -+ .name = "963281T_TEF:green:power", ++ .name = "A4001N1:green:power", + .gpio = 4, + .active_low = 1, + .default_trigger = "default-on", + }, + { -+ .name = "963281T_TEF:red:power", ++ .name = "A4001N1:red:power", + .gpio = 8, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:inet", ++ .name = "A4001N1:green:inet", + .gpio = 11, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:inet", ++ .name = "A4001N1:red:inet", + .gpio = 2, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:ppp", ++ .name = "A4001N1:green:ppp", + .gpio = 3, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:ppp", ++ .name = "A4001N1:red:ppp", + .gpio = 5, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:3g", ++ .name = "A4001N1:green:3g", + .gpio = 6, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:3g", ++ .name = "A4001N1:red:3g", + .gpio = 7, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:wlan", ++ .name = "A4001N1:green:wlan", + .gpio = 9, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:wlan", ++ .name = "A4001N1:red:wlan", + .gpio = 10, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:eth", ++ .name = "A4001N1:green:eth", + .gpio = 31, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:eth", ++ .name = "A4001N1:red:eth", + .gpio = 20, + .active_low = 1, + }, @@ -131,7 +131,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, -+ &board_963281T_TEF, ++ &board_A4001N1, &board_dsl_274xb_f1, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch index dad94a148d..8c67994e6b 100644 --- a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch +++ b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch @@ -86,5 +86,5 @@ &board_96328avng, + &board_96328A_1441N1, &board_963281TAN, - &board_963281T_TEF, + &board_A4001N1, &board_dsl_274xb_f1, diff --git a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch index c22d725dc9..6866c84f08 100644 --- a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch +++ b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch @@ -81,4 +81,4 @@ + &board_96328A_1241N, &board_96328A_1441N1, &board_963281TAN, - &board_963281T_TEF, + &board_A4001N1, diff --git a/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch index 484e471846..d377d8be05 100644 --- a/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch @@ -137,7 +137,7 @@ Signed-off-by: Marcin Jurkowski .expected_cpu_id = 0x6348, @@ -3814,6 +3930,7 @@ static const struct board_info __initcon &board_963281TAN, - &board_963281T_TEF, + &board_A4001N1, &board_dsl_274xb_f1, + &board_FAST2704V2, #endif diff --git a/target/linux/brcm63xx/patches-3.14/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch similarity index 79% rename from target/linux/brcm63xx/patches-3.14/530-board_963281T_TEF.patch rename to target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch index bfa2333494..4706e8ce1f 100644 --- a/target/linux/brcm63xx/patches-3.14/530-board_963281T_TEF.patch +++ b/target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch @@ -4,7 +4,7 @@ }, }; -+static struct board_info __initdata board_963281T_TEF = { ++static struct board_info __initdata board_A4001N1 = { + .name = "963281T_TEF", + .expected_cpu_id = 0x6328, + @@ -42,63 +42,63 @@ + + .leds = { + { -+ .name = "963281T_TEF:green:power", ++ .name = "A4001N1:green:power", + .gpio = 4, + .active_low = 1, + .default_trigger = "default-on", + }, + { -+ .name = "963281T_TEF:red:power", ++ .name = "A4001N1:red:power", + .gpio = 8, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:inet", ++ .name = "A4001N1:green:inet", + .gpio = 11, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:inet", ++ .name = "A4001N1:red:inet", + .gpio = 2, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:ppp", ++ .name = "A4001N1:green:ppp", + .gpio = 3, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:ppp", ++ .name = "A4001N1:red:ppp", + .gpio = 5, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:3g", ++ .name = "A4001N1:green:3g", + .gpio = 6, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:3g", ++ .name = "A4001N1:red:3g", + .gpio = 7, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:wlan", ++ .name = "A4001N1:green:wlan", + .gpio = 9, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:wlan", ++ .name = "A4001N1:red:wlan", + .gpio = 10, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:green:eth", ++ .name = "A4001N1:green:eth", + .gpio = 31, + .active_low = 1, + }, + { -+ .name = "963281T_TEF:red:eth", ++ .name = "A4001N1:red:eth", + .gpio = 20, + .active_low = 1, + }, @@ -131,7 +131,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, -+ &board_963281T_TEF, ++ &board_A4001N1, &board_dsl_274xb_f1, #endif #ifdef CONFIG_BCM63XX_CPU_6338 diff --git a/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch index ca52f346b8..ad1f50b42f 100644 --- a/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch +++ b/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch @@ -86,5 +86,5 @@ &board_96328avng, + &board_96328A_1441N1, &board_963281TAN, - &board_963281T_TEF, + &board_A4001N1, &board_dsl_274xb_f1, diff --git a/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch index 267c15f3c2..1a9f3c977f 100644 --- a/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch +++ b/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch @@ -81,4 +81,4 @@ + &board_96328A_1241N, &board_96328A_1441N1, &board_963281TAN, - &board_963281T_TEF, + &board_A4001N1, diff --git a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch index 4fa9f90507..f187ee4505 100644 --- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch @@ -137,7 +137,7 @@ Signed-off-by: Marcin Jurkowski .expected_cpu_id = 0x6348, @@ -3824,6 +3940,7 @@ static const struct board_info __initcon &board_963281TAN, - &board_963281T_TEF, + &board_A4001N1, &board_dsl_274xb_f1, + &board_FAST2704V2, #endif