ramips: use generic board detection for D-Link DAP-1522 A1

Use the generic board detection for the D-Link DAP-1522 A1 instead of the
target specific one as all recent additions are doing.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 8f0a2b0725774496f92c49fb74b791839ca18ebc..4208321e69ccc25f0fbc966fb99d048c881f1d61 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -242,7 +242,7 @@ ramips_setup_interfaces()
                ;;
        cs-qr10|\
        d105|\
-       dap-1522-a1|\
+       dlink,dap-1522-a1|\
        dch-m225|\
        ex2700|\
        ex3700|\

diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index 342a6486872cb0f1d3ccb5e00ea42fdf786663c7..04a398c82697e7b98f15494e77e34a19a714d907 100644 (file)
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -147,7 +147,7 @@ get_status_led() {
        youku-yk1)
                status_led="$boardname:blue:power"
                ;;
-       dap-1522-a1|\
+       dlink,dap-1522-a1|\
        k2p|\
        m3|\
        mir3g|\

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
index 7e579316b5536aa6b3a196634ed42bcdb6ba4e0b..54deb5b2e093352b249de6fe6c20ee12d4df10d3 100644 (file)
--- a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
+++ b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum
@@ -20,7 +20,7 @@ dir-645 | \
 dir-860l-b1)
        fix_checksum seama
        ;;
-dap-1522-a1)
+dlink,dap-1522-a1)
        fix_checksum wrg
        ;;
 esac

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 9738f01dfe408d73a3c1fd627a660bffdd26fe42..74ed5913b8c2e00172f01d5da09afd5c400f7d20 100755 (executable)
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -112,9 +112,6 @@ ramips_board_detect() {
        *"DAP-1350")
                name="dap-1350"
                ;;
-       *"DAP-1522 A1")
-               name="dap-1522-a1"
-               ;;
        *"DB-WRT01")
                name="db-wrt01"
                ;;

diff --git a/target/linux/ramips/image/rt288x.mk b/target/linux/ramips/image/rt288x.mk
index e9627a7431b0a766ea3e2692688894f15e6e4342..280ce561728fdb8829e2deefcab62f9028e2b0f2 100644 (file)
--- a/target/linux/ramips/image/rt288x.mk
+++ b/target/linux/ramips/image/rt288x.mk
@@ -30,7 +30,7 @@ define Device/ar725w
 endef
 TARGET_DEVICES += ar725w
 
-define Device/dap-1522-a1
+define Device/dlink_dap-1522-a1
   DTS := DAP-1522-A1
   BLOCKSIZE := 64k
   IMAGE_SIZE := 3801088
@@ -44,7 +44,7 @@ define Device/dap-1522-a1
        wrg-header wapnd01_dlink_dap1522 | \
        check-size $$$$(IMAGE_SIZE)
 endef
-TARGET_DEVICES += dap-1522-a1
+TARGET_DEVICES += dlink_dap-1522-a1
 
 define Device/f5d8235-v1
   IMAGE_SIZE := 7744k