From: Mathias Kresin <dev@kresin.me>
Date: Sat, 17 Feb 2018 08:18:09 +0000 (+0100)
Subject: ramips: use generic board detection for D-Link DAP-1522 A1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c330408ea92d9bf6af187b90d2f3f513d4d8ed8a;p=openwrt%2Fstaging%2Fjow.git

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 8f0a2b0725..4208321e69 100755
--- 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 342a648687..04a398c826 100644
--- 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 7e579316b5..54deb5b2e0 100644
--- 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 9738f01dfe..74ed5913b8 100755
--- 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 e9627a7431..280ce56172 100644
--- 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