From beb25f96eb444b5770008959f3247a50225a16db Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 12 Jul 2014 12:31:35 +0000 Subject: [PATCH] brcm63xx: Use model name for Comtrend AR-5381u MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas Signed-off-by: Jonas Gorski SVN-Revision: 41587 --- target/linux/brcm63xx/base-files/lib/brcm63xx.sh | 2 +- target/linux/brcm63xx/image/Makefile | 3 ++- ...ard_96328a-1241N.patch => 532-board_AR-5381u.patch} | 10 +++++----- .../brcm63xx/patches-3.10/555-board_96318ref.patch | 2 +- ...ard_96328a-1241N.patch => 532-board_AR-5381u.patch} | 10 +++++----- .../brcm63xx/patches-3.14/555-board_96318ref.patch | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) rename target/linux/brcm63xx/patches-3.10/{532-board_96328a-1241N.patch => 532-board_AR-5381u.patch} (87%) rename target/linux/brcm63xx/patches-3.14/{532-board_96328a-1241N.patch => 532-board_AR-5381u.patch} (87%) diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index be381c2042d3..a01606a7a0d3 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -25,7 +25,7 @@ brcm63xx_detect() { ;; 96328A-1241N) brcm63xx_has_reset_button="true" - status_led="96328A-1241N:green:power" + status_led="AR-5381u:green:power" ifname=eth0 ;; 96369R-1231N) diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index a4108483cc8c..11d7678581bc 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -168,7 +168,6 @@ define Image/Build $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-4M-flash-generic,,--pad 2) $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-8M-flash-generic,,--pad 4) $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-16M-flash-generic,,--pad 8) - $(call Image/Build/CFE,$(1),96328A-1241N,6328,96328A-1241N-generic,,--pad 8) $(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) @@ -227,6 +226,8 @@ define Image/Build $(call Image/Build/CFE,$(1),CT6373-1,6358,CT6373) # Comtrend 536, 5621 $(call Image/Build/CFEFIXUP,$(1),96348GW-11,CT536_CT5621,6348,CT536_CT5621) + # Comtrend AR-5381u + $(call Image/Build/CFE,$(1),96328A-1241N,6328,AR-5381u,,--pad 8) # Comtrend AR-5387un $(call Image/Build/CFE,$(1),96328A-1441N1,6328,AR-5387un,,--pad 8) # Comtrend WAP-5813n diff --git a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.10/532-board_AR-5381u.patch similarity index 87% rename from target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch rename to target/linux/brcm63xx/patches-3.10/532-board_AR-5381u.patch index bcbf50a8437f..5cda917ba311 100644 --- a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch +++ b/target/linux/brcm63xx/patches-3.10/532-board_AR-5381u.patch @@ -4,7 +4,7 @@ }, }; -+static struct board_info __initdata board_96328A_1241N = { ++static struct board_info __initdata board_AR5381u = { + .name = "96328A-1241N", + .expected_cpu_id = 0x6328, + @@ -42,18 +42,18 @@ + + .leds = { + { -+ .name = "96328A-1241N:green:power", ++ .name = "AR-5381u:green:power", + .gpio = 4, + .active_low = 1, + .default_trigger = "default-on", + }, + { -+ .name = "96328A-1241N:red:alarm", ++ .name = "AR-5381u:red:alarm", + .gpio = 2, + .active_low = 1, + }, + { -+ .name = "96328A-1241N:green:inet", ++ .name = "AR-5381u:green:inet", + .gpio = 3, + .active_low = 1, + }, @@ -78,7 +78,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -+ &board_96328A_1241N, ++ &board_AR5381u, &board_AR5387un, &board_963281TAN, &board_A4001N1, diff --git a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch index 20cee1c41d84..5ba1a2906ee0 100644 --- a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch @@ -103,4 +103,4 @@ +#endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, - &board_96328A_1241N, + &board_AR5381u, diff --git a/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch similarity index 87% rename from target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch rename to target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch index 268acdcf4fed..d9bb8458a7cb 100644 --- a/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch +++ b/target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch @@ -4,7 +4,7 @@ }, }; -+static struct board_info __initdata board_96328A_1241N = { ++static struct board_info __initdata board_AR5381u = { + .name = "96328A-1241N", + .expected_cpu_id = 0x6328, + @@ -42,18 +42,18 @@ + + .leds = { + { -+ .name = "96328A-1241N:green:power", ++ .name = "AR-5381u:green:power", + .gpio = 4, + .active_low = 1, + .default_trigger = "default-on", + }, + { -+ .name = "96328A-1241N:red:alarm", ++ .name = "AR-5381u:red:alarm", + .gpio = 2, + .active_low = 1, + }, + { -+ .name = "96328A-1241N:green:inet", ++ .name = "AR-5381u:green:inet", + .gpio = 3, + .active_low = 1, + }, @@ -78,7 +78,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -+ &board_96328A_1241N, ++ &board_AR5381u, &board_AR5387un, &board_963281TAN, &board_A4001N1, diff --git a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch index 52a1e6d3633f..88286d3801dc 100644 --- a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch @@ -103,4 +103,4 @@ +#endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, - &board_96328A_1241N, + &board_AR5381u, -- 2.30.2