aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-07-12 12:31:33 +0000
committerJonas Gorski <jogo@openwrt.org>2014-07-12 12:31:33 +0000
commitc9b2e96909cb89f8bd91ef13ab7f89799783ae3b (patch)
treedd5a36c10a6bd43e0ffa7479df2731f9aa6d62d0 /target
parentaee666d8f9bd92bd8ebd7ec53631f4d5a6d36fba (diff)
downloadupstream-c9b2e96909cb89f8bd91ef13ab7f89799783ae3b.tar.gz
upstream-c9b2e96909cb89f8bd91ef13ab7f89799783ae3b.tar.bz2
upstream-c9b2e96909cb89f8bd91ef13ab7f89799783ae3b.zip
brcm63xx: Use model name for Comtrend AR-5387un
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41586
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/brcm63xx/base-files/lib/brcm63xx.sh2
-rwxr-xr-xtarget/linux/brcm63xx/image/Makefile3
-rw-r--r--target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch (renamed from target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch)14
-rw-r--r--target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch (renamed from target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch)14
-rw-r--r--target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch4
6 files changed, 21 insertions, 20 deletions
diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index afacffcd9a..be381c2042 100755
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -45,7 +45,7 @@ brcm63xx_detect() {
;;
96328A-1441N1)
brcm63xx_has_reset_button="true"
- status_led="96328A-1441N1:green:power"
+ status_led="AR-5387un:green:power"
ifname=eth0
;;
963281TAN)
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 711c80219a..a4108483cc 100755
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -169,7 +169,6 @@ define Image/Build
$(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),96328A-1441N1,6328,96328A-1441N1-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)
@@ -228,6 +227,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-5387un
+ $(call Image/Build/CFE,$(1),96328A-1441N1,6328,AR-5387un,,--pad 8)
# Comtrend WAP-5813n
$(call Image/Build/CFE,$(1),96369R-1231N,6368,WAP-5813n,,--pad 4)
# Davolink DV201AMR
diff --git a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch
index 8c67994e6b..08062751e8 100644
--- a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
+++ b/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch
@@ -4,7 +4,7 @@
},
};
-+static struct board_info __initdata board_96328A_1441N1 = {
++static struct board_info __initdata board_AR5387un = {
+ .name = "96328A-1441N1",
+ .expected_cpu_id = 0x6328,
+
@@ -42,24 +42,24 @@
+
+ .leds = {
+ {
-+ .name = "96328A-1441N1:green:power",
++ .name = "AR-5387un:green:power",
+ .gpio = 8,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "96328A-1441N1:red:power",
++ .name = "AR-5387un:red:power",
+ .gpio = 4,
+ },
+ {
-+ .name = "96328A-1441N1:green:inet",
++ .name = "AR-5387un:green:inet",
+ .gpio = 7,
+ },
+ {
-+ .name = "96328A-1441N1:red:inet",
++ .name = "AR-5387un:red:inet",
+ .gpio = 1,
+ },
+ {
-+ .name = "96328A-1441N1:green:dsl",
++ .name = "AR-5387un:green:dsl",
+ .gpio = 11,
+ .active_low = 1,
+ },
@@ -84,7 +84,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-+ &board_96328A_1441N1,
++ &board_AR5387un,
&board_963281TAN,
&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 6866c84f08..bcbf50a843 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
@@ -71,7 +71,7 @@
+ },
+};
+
- static struct board_info __initdata board_96328A_1441N1 = {
+ static struct board_info __initdata board_AR5387un = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
@@ -3152,6 +3219,7 @@ static const struct board_info __initcon
@@ -79,6 +79,6 @@
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
+ &board_96328A_1241N,
- &board_96328A_1441N1,
+ &board_AR5387un,
&board_963281TAN,
&board_A4001N1,
diff --git a/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
index ad1f50b42f..c62b5dd027 100644
--- a/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch
+++ b/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
@@ -4,7 +4,7 @@
},
};
-+static struct board_info __initdata board_96328A_1441N1 = {
++static struct board_info __initdata board_AR5387un = {
+ .name = "96328A-1441N1",
+ .expected_cpu_id = 0x6328,
+
@@ -42,24 +42,24 @@
+
+ .leds = {
+ {
-+ .name = "96328A-1441N1:green:power",
++ .name = "AR-5387un:green:power",
+ .gpio = 8,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "96328A-1441N1:red:power",
++ .name = "AR-5387un:red:power",
+ .gpio = 4,
+ },
+ {
-+ .name = "96328A-1441N1:green:inet",
++ .name = "AR-5387un:green:inet",
+ .gpio = 7,
+ },
+ {
-+ .name = "96328A-1441N1:red:inet",
++ .name = "AR-5387un:red:inet",
+ .gpio = 1,
+ },
+ {
-+ .name = "96328A-1441N1:green:dsl",
++ .name = "AR-5387un:green:dsl",
+ .gpio = 11,
+ .active_low = 1,
+ },
@@ -84,7 +84,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
-+ &board_96328A_1441N1,
++ &board_AR5387un,
&board_963281TAN,
&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 1a9f3c977f..268acdcf4f 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
@@ -71,7 +71,7 @@
+ },
+};
+
- static struct board_info __initdata board_96328A_1441N1 = {
+ static struct board_info __initdata board_AR5387un = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
@@ -3162,6 +3229,7 @@ static const struct board_info __initcon
@@ -79,6 +79,6 @@
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
+ &board_96328A_1241N,
- &board_96328A_1441N1,
+ &board_AR5387un,
&board_963281TAN,
&board_A4001N1,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 16:50:57 +0000