ar71xx: add support for dlink dir-615-e1

Dlink dir-615-e1 can use dir-600-a1's image, but the image can't be
uploaded through dlink's normal firmware update web page.

Add profile for dir-615-e1 so the generated image can be uploaded
through the firmware update web page.

Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
SVN-Revision: 40969

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 33ffee7bf5521578630665b5c5d840169aeffd30..d555c5b603169c00435e30d074e6150b7248971b 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -48,6 +48,7 @@ get_status_led() {
                ;;
        dir-505-a1 |\
        dir-600-a1 |\
+       dir-615-e1 |\
        dir-615-e4)
                status_led="d-link:green:power"
                ;;

diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 4338a49c80f98dfad2a33ad69277cda69ac17550..849fd564acfcfabe3f32abac641b33fca6646b8a 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -85,6 +85,7 @@ dir-505-a1)
        ;;
 
 dir-600-a1|\
+dir-615-e1|\
 dir-615-e4)
        ucidef_set_led_netdev "wan" "WAN" "d-link:green:wan" "eth1"
        ucidef_set_led_switch "lan1" "LAN1" "d-link:green:lan1" "switch0" "0x02"

diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 62373e43e15979fad2f6c73a5484a0ed3efc4df0..e8268cac8ba109920c9f6734233e101cfb2cfb35 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -287,6 +287,7 @@ ap96 |\
 airrouter |\
 dir-600-a1 |\
 dir-615-c1 |\
+dir-615-e1 |\
 dir-615-e4 |\
 ja76pf |\
 mynet-n600 |\

diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
index 718a924f1918bf56b77ab7392c676a2d3a96772a..093fbc16abf207d2e2f783bcff38cb07dc509f2f 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
@@ -58,6 +58,7 @@ ap96|\
 airrouter|\
 dir-600-a1|\
 dir-615-c1|\
+dir-615-e1|\
 dir-615-e4|\
 ja76pf|\
 rb-750|\

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index a136f4ae63b1fd1a3bbba959245b447c31287557..8682812ac8b18628989bba39d5f8d23aecb4d1f7 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -280,6 +280,9 @@ ar71xx_board_detect() {
        *"DIR-600 rev. A1")
                name="dir-600-a1"
                ;;
+       *"DIR-615 rev. E1")
+               name="dir-615-e1"
+               ;;
        *"DIR-615 rev. E4")
                name="dir-615-e4"
                ;;

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 551d3ce27a37f261fe22d806d90bf890816ac49d..9315ac0134d69ce89fce48a1b58c883a1e20e7a2 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -146,6 +146,7 @@ platform_check_image() {
        dir-505-a1 | \
        dir-600-a1 | \
        dir-615-c1 | \
+       dir-615-e1 | \
        dir-615-e4 | \
        dir-825-c1 | \
        dir-835-a1 | \

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c
index c0fa9008c0a4111755550accb1a085b6f90edb91..321fdce708e25cc36a7e5f355f24431426a2f492 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-600-a1.c
@@ -141,6 +141,14 @@ static void __init dir_600_a1_setup(void)
 MIPS_MACHINE(ATH79_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1",
             dir_600_a1_setup);
 
+static void __init dir_615_e1_setup(void)
+{
+       dir_600_a1_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_DIR_615_E1, "DIR-615-E1", "D-Link DIR-615 rev. E1",
+            dir_615_e1_setup);
+
 static void __init dir_615_e4_setup(void)
 {
        dir_600_a1_setup();

diff --git a/target/linux/ar71xx/generic/profiles/d-link.mk b/target/linux/ar71xx/generic/profiles/d-link.mk
index c9724c24e9f70c290c72db2e45511108c653b840..eb721c3503625118fc9016162803cc8fce95a7bf 100644 (file)
--- a/target/linux/ar71xx/generic/profiles/d-link.mk
+++ b/target/linux/ar71xx/generic/profiles/d-link.mk
@@ -60,6 +60,16 @@ endef
 
 $(eval $(call Profile,DIR615C1))
 
+define Profile/DIR615E1
+       NAME:=D-Link DIR-615 rev. E1
+       PACKAGES:=
+endef
+
+define Profile/DIR615E1/Description
+       Package set optimized for the D-Link DIR-615 rev. E1.
+endef
+
+$(eval $(call Profile,DIR615E1))
 
 define Profile/DIR615E4
        NAME:=D-Link DIR-615 rev. E4

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 8234f88eaa8738b1958979ef8ed659e4dff57ea5..8da2095eda91f99cd14f5410ba7cc628c73dcd73 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -1025,6 +1025,7 @@ $(eval $(call SingleProfile,CameoAP91,64kraw,DIR600A1,dir-600-a1,DIR-600-A1,ttyS
 $(eval $(call SingleProfile,CameoAP91,64kraw,DIR601A1,dir-601-a1,DIR-600-A1,ttyS0,115200,"AP91-AR7240-RT-090223-02"))
 $(eval $(call SingleProfile,CameoAP91,64kraw,FR54RTR,fr-54rtr,DIR-600-A1,ttyS0,115200,"AP91-AR7240-RT-090223-01"))
 
+$(eval $(call SingleProfile,CameoAP99,64kraw,DIR615E1,dir-615-e1,DIR-615-E1,ttyS0,115200,"AP93-AR7240-RT-081028-00"))
 $(eval $(call SingleProfile,CameoAP99,64kraw,DIR615E4,dir-615-e4,DIR-615-E4,ttyS0,115200,"AP99-AR7240-RT-091105-05"))
 
 $(eval $(call SingleProfile,CameoAP81,64kraw-nojffs,A02RBW300N,a02-rb-w300n,TEW-632BRP,ttyS0,115200,"AP81-AR9130-RT-070614-03"))

diff --git a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
index 11b49ace333967bd0505fcd17912918a60490472..57e181702faadd0fb2704d0145642f613a605755 100644 (file)
--- a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
@@ -29,6 +29,7 @@
 +      ATH79_MACH_DIR_505_A1,          /* D-Link DIR-505 rev. A1 */
 +      ATH79_MACH_DIR_600_A1,          /* D-Link DIR-600 rev. A1 */
 +      ATH79_MACH_DIR_615_C1,          /* D-Link DIR-615 rev. C1 */
++      ATH79_MACH_DIR_615_E1,          /* D-Link DIR-615 rev. E1 */
 +      ATH79_MACH_DIR_615_E4,          /* D-Link DIR-615 rev. E4 */
 +      ATH79_MACH_DIR_825_B1,          /* D-Link DIR-825 rev. B1 */
 +      ATH79_MACH_DIR_825_C1,          /* D-Link DIR-825 rev. C1 */
@@ -423,7 +424,7 @@
 +      select ATH79_NVRAM
 +
 +config ATH79_MACH_DIR_600_A1
-+      bool "D-Link DIR-600 A1/DIR-615 E4 support"
++      bool "D-Link DIR-600 A1/DIR-615 E1/DIR-615 E4 support"
 +      select SOC_AR724X
 +      select ATH79_DEV_AP9X_PCI if PCI
 +      select ATH79_DEV_ETH