X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fnoltari.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Framips.sh;h=7630166b89c6249ce4f55b26ee8612dff39f76ea;hp=b89a88c27cf63bffd6288c34ab3d6983d5582a42;hb=c6fe325587b1955f84c339a2ae17da28dc4e6bec;hpb=c10bdf11ff6ac0713b5b519203c0869e747d87c0

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index b89a88c27c..7630166b89 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -13,6 +13,9 @@ ramips_board_detect() {
 	machine=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo)
 
 	case "$machine" in
+	*"11AC NAS Router")
+		name="11acnas"
+		;;
 	*"3G150B")
 		name="3g150b"
 		;;
@@ -37,8 +40,11 @@ ramips_board_detect() {
 	*"ALL0239-3G")
 		name="all0239-3g"
 		;;
-	*"ALL0256N")
-		name="all0256n"
+	*"ALL0256N (4M)")
+		name="all0256n-4M"
+		;;
+	*"ALL0256N (8M)")
+		name="all0256n-8M"
 		;;
 	*"ALL5002")
 		name="all5002"
@@ -52,8 +58,11 @@ ramips_board_detect() {
 	*"AR725W")
 		name="ar725w"
 		;;
-	*"ASL26555")
-		name="asl26555"
+	*"ASL26555 (8M)")
+		name="asl26555-8M"
+		;;
+	*"ASL26555 (16M)")
+		name="asl26555-16M"
 		;;
 	*"ATP-52B")
 		name="atp-52b"
@@ -61,8 +70,11 @@ ramips_board_detect() {
 	*"AWAPN2403")
 		name="awapn2403"
 		;;
-	*"AWM002 EVB")
-		name="awm002-evb"
+	*"AWM002 EVB (4M)")
+		name="awm002-evb-4M"
+		;;
+	*"AWM002 EVB (8M)")
+		name="awm002-evb-8M"
 		;;
 	*"AWM003 EVB")
 		name="awm003-evb"
@@ -82,30 +94,45 @@ ramips_board_detect() {
 	*"C20i")
 		name="c20i"
 		;;
+	*"C50")
+		name="c50"
+		;;
 	*"Carambola")
 		name="carambola"
 		;;
 	*"CF-WR800N")
 		name="cf-wr800n"
 		;;
+	*"CS-QR10")
+		name="cs-qr10"
+		;;
 	*"CY-SWR1100")
 		name="cy-swr1100"
 		;;
 	*"D105")
 		name="d105"
 		;;
+	*"D240")
+		name="d240"
+		;;
 	*"DAP-1350")
 		name="dap-1350"
 		;;
 	*"DB-WRT01")
 		name="db-wrt01"
 		;;
+	*"DCH-M225")
+		name="dch-m225"
+		;;
 	*"DCS-930")
 		name="dcs-930"
 		;;
 	*"DCS-930L B1")
 		name="dcs-930l-b1"
 		;;
+	*"Digineo AC1200 Pro")
+		name="ac1200pro"
+		;;
 	*"DIR-300 B1")
 		name="dir-300-b1"
 		;;
@@ -118,9 +145,6 @@ ramips_board_detect() {
 	*"DIR-600 B1")
 		name="dir-600-b1"
 		;;
-	*"DIR-600 B2")
-		name="dir-600-b2"
-		;;
 	*"DIR-610 A1")
 		name="dir-610-a1"
 		;;
@@ -145,12 +169,30 @@ ramips_board_detect() {
 	*"DIR-860L B1")
 		name="dir-860l-b1"
 		;;
+	*"Dovado Tiny AC")
+		name="tiny-ac"
+		;;
+	*"DuZun DM06")
+		name="duzun-dm06"
+		;;
+	*"DWR-512 B")
+		name="dwr-512-b"
+		;;
 	*"E1700")
 		name="e1700"
 		;;
 	*"ESR-9753")
 		name="esr-9753"
 		;;
+	*"EW1200")
+		name="ew1200"
+		;;
+	*"EX2700")
+		name="ex2700";
+		;;
+	*"EX3700")
+		name="ex3700"
+		;;
 	*"F5D8235 v1")
 		name="f5d8235-v1"
 		;;
@@ -169,15 +211,30 @@ ramips_board_detect() {
 	*"FreeStation5")
 		name="freestation5"
 		;;
+	*"GL-MT300A")
+		name="gl-mt300a"
+		;;
+	*"GL-MT300N")
+		name="gl-mt300n"
+		;;
+	*"GL-MT750")
+		name="gl-mt750"
+		;;
 	*"HC5661")
 		name="hc5661"
 		;;
+	*"HC5661A")
+		name="hc5661a"
+		;;
 	*"HC5761")
 		name="hc5761"
 		;;
 	*"HC5861")
 		name="hc5861"
 		;;
+	*"HC5962")
+		name="hc5962"
+		;;
 	*"HG255D")
 		name="hg255d"
 		;;
@@ -196,15 +253,39 @@ ramips_board_detect() {
 	*"IP2202")
 		name="ip2202"
 		;;
+	*"JHR-N805R")
+		name="jhr-n805r"
+		;;
+	*"JHR-N825R")
+		name="jhr-n825r"
+		;;
+	*"JHR-N926R")
+		name="jhr-n926r"
+		;;
 	*"M3")
 		name="m3"
 		;;
-	*"M4")
-		name="m4"
+	*"M4 (4M)")
+		name="m4-4M"
+		;;
+	*"M4 (8M)")
+		name="m4-8M"
+		;;
+	*"MediaTek LinkIt Smart 7688")
+		linkit="$(dd bs=1 skip=1024 count=12 if=/dev/mtd2 2> /dev/null)"
+		if [ "${linkit}" = "LINKITS7688D" ]; then
+			name="linkits7688d"
+			RAMIPS_MODEL="${machine} DUO"
+		else
+			name="linkits7688"
+		fi
 		;;
 	*"Memory 2 Move")
 		name="m2m"
 		;;
+	*"Mercury MAC1200R v2")
+		name="mac1200r-v2"
+		;;
 	*"MicroWRT")
 		name="microwrt"
 		;;
@@ -217,6 +298,9 @@ ramips_board_detect() {
 	*"MiWiFi Mini")
 		name="miwifi-mini"
 		;;
+	*"MiWiFi Nano")
+		name="miwifi-nano"
+		;;
 	*"MLW221")
 		name="mlw221"
 		;;
@@ -235,6 +319,9 @@ ramips_board_detect() {
 	*"MR-102N")
 		name="mr-102n"
 		;;
+	*"MR200")
+		name="mr200"
+		;;
 	*"MT7620a + MT7530 evaluation"*)
 		name="mt7620a_mt7530"
 		;;
@@ -256,39 +343,87 @@ ramips_board_detect() {
 	*"MZK-DP150N")
 		name="mzk-dp150n"
 		;;
+	*"MZK-EX300NP")
+		name="mzk-ex300np"
+		;;
+	*"MZK-EX750NP")
+		name="mzk-ex750np"
+		;;
 	*"MZK-W300NH2"*)
 		name="mzk-w300nh2"
 		;;
+	*"MZK-WDPR"*)
+		name="mzk-wdpr"
+		;;
 	*"NA930")
 		name="na930"
 		;;
 	*"NBG-419N")
 		name="nbg-419n"
 		;;
+	*"NBG-419N v2")
+		name="nbg-419n2"
+		;;
+	*"Newifi-D1")
+		name="newifi-d1"
+		;;
 	*"NCS601W")
 		name="ncs601w"
 		;;
+	*"NixcoreX1 (8M)")
+		name="nixcore-x1-8M"
+		;;
+	*"NixcoreX1 (16M)")
+		name="nixcore-x1-16M"
+		;;
 	*"NW718")
 		name="nw718"
 		;;
+	*"Onion Omega2")
+		name="omega2"
+		;;
+	*"Onion Omega2+")
+		name="omega2p"
+		;;
 	*"OY-0001")
 		name="oy-0001"
 		;;
+	*"PBR-D1")
+		name="pbr-d1"
+		;;
 	*"PBR-M1")
 		name="pbr-m1"
 		;;
+	*"PSG1208")
+		name="psg1208"
+		;;
+	*"PSG1218 rev.A")
+		name="psg1218a"
+		;;
+	*"PSG1218 rev.B")
+		name="psg1218b"
+		;;
 	*"PSR-680W"*)
 		name="psr-680w"
 		;;
 	*"PWH2004")
 		name="pwh2004"
 		;;
-	*"PX-4885")
-		name="px-4885"
+	*"PX-4885 (4M)")
+		name="px-4885-4M"
+		;;
+	*"PX-4885 (8M)")
+		name="px-4885-8M"
 		;;
 	*"Q7")
 		name="zte-q7"
 		;;
+	*"R6220")
+		name="r6220"
+		;;
+	*"RB750Gr3")
+		name="rb750gr3"
+		;;
 	*"RE6500")
 		name="re6500"
 		;;
@@ -325,6 +460,9 @@ ramips_board_detect() {
 	*"RUT5XX")
 		name="rut5xx"
 		;;
+	*"SamKnows Whitebox 8")
+		name="sk-wb8"
+		;;
 	*"SAP-G3200U3")
 		name="sap-g3200u3"
 		;;
@@ -337,6 +475,15 @@ ramips_board_detect() {
 	*"TEW-692GR")
 		name="tew-692gr"
 		;;
+	*"TEW-714TRU")
+		name="tew-714tru"
+		;;
+	*"Timecloud")
+		name="timecloud"
+		;;
+	*"UBNT-ERX")
+		name="ubnt-erx"
+		;;
 	*"UR-326N4G")
 		name="ur-326n4g"
 		;;
@@ -349,21 +496,39 @@ ramips_board_detect() {
 	*"V22RW-2X2")
 		name="v22rw-2x2"
 		;;
-	*"VoCore")
-		name="vocore"
+	*"VoCore (8M)")
+		name="vocore-8M"
+		;;
+	*"VoCore (16M)")
+		name="vocore-16M"
+		;;
+	*"VoCore2")
+		name="vocore2"
+		;;
+	*"VR500")
+		name="vr500"
 		;;
 	*"W150M")
 		name="w150m"
 		;;
+	*"W2914NS v2")
+		name="w2914nsv2"
+		;;
 	*"W306R V2.0")
 		name="w306r-v20"
 		;;
 	*"W502U")
 		name="w502u"
 		;;
+	*"WCR-1166DS")
+		name="wcr-1166ds"
+		;;
 	*"WCR-150GN")
 		name="wcr-150gn"
 		;;
+	*"WF-2881")
+		name="wf-2881"
+		;;
 	*"WHR-1166D")
 		name="whr-1166d"
 		;;
@@ -376,12 +541,18 @@ ramips_board_detect() {
 	*"WHR-G300N")
 		name="whr-g300n"
 		;;
+	*"Widora-NEO")
+		name="widora-neo"
+		;;
+	*"WiTi")
+                name="witi"
+		;;
 	*"WIZARD 8800")
 		name="wizard8800"
 		;;
 	*"WizFi630A")
 		name="wizfi630a"
-		;;                
+		;;
 	*"WL-330N")
 		name="wl-330n"
 		;;
@@ -394,35 +565,65 @@ ramips_board_detect() {
 	*"WL-351 v1 002")
 		name="wl-351"
 		;;
+	*"WL-WN575A3")
+		name="wl-wn575a3"
+		;;
 	*"WLI-TX4-AG300N")
 		name="wli-tx4-ag300n"
 		;;
+	*"WLR-6000")
+		name="wlr-6000"
+		;;
 	*"WMR-300")
 		name="wmr-300"
 		;;
+	*"WN3000RPv3")
+		name="wn3000rpv3"
+		;;
 	*"WNCE2001")
 		name="wnce2001"
 		;;
-	*"WR512-3GN-like"*)
-		name="wr512-3gn"
+	*"WNDR3700v5")
+		name="wndr3700v5"
+		;;
+	*"WR512-3GN (4M)")
+		name="wr512-3gn-4M"
+		;;
+	*"WR512-3GN (8M)")
+		name="wr512-3gn-8M"
 		;;
 	*"WR6202")
 		name="wr6202"
 		;;
+	*"WRH-300CR")
+		name="wrh-300cr"
+		;;
 	*"WRTNODE")
 		name="wrtnode"
 		;;
+	*"WRTnode2R")
+		name="wrtnode2r"
+		;;
+	*"WRTnode2P")
+		name="wrtnode2p"
+		;;
 	*"WSR-1166DHP")
 		name="wsr-1166"
 		;;
 	*"WSR-600DHP")
 		name="wsr-600"
 		;;
-	*"WT1520")
-		name="wt1520"
+	*"WT1520 (4M)")
+		name="wt1520-4M"
+		;;
+	*"WT1520 (8M)")
+		name="wt1520-8M"
 		;;
-	*"WT3020")
-		name="wt3020"
+	*"WT3020 (4M)")
+		name="wt3020-4M"
+		;;
+	*"WT3020 (8M)")
+		name="wt3020-8M"
 		;;
 	*"WZR-AGL300NH")
 		name="wzr-agl300nh"
@@ -439,12 +640,42 @@ ramips_board_detect() {
 	*"Y1S")
 		name="y1s"
 		;;
+	*"ZBT-APE522II")
+		name="zbt-ape522ii"
+		;;
+	*"ZBT-CPE102")
+		name="zbt-cpe102"
+		;;
 	*"ZBT-WA05")
 		name="zbt-wa05"
 		;;
+	*"ZBT-WE2026")
+		name="zbt-we2026"
+		;;
+	*"ZBT-WE826")
+		name="zbt-we826"
+		;;
+	*"ZBT-WG2626")
+		name="zbt-wg2626"
+		;;
+	*"ZBT-WG3526")
+		name="zbt-wg3526"
+		;;
 	*"ZBT-WR8305RT")
 		name="zbt-wr8305rt"
 		;;
+	*"ZyXEL Keenetic Omni")
+		name="kn_rc"
+		;;
+	*"ZyXEL Keenetic Omni II")
+		name="kn_rf"
+		;;
+	*"ZyXEL Keenetic Viva")
+		name="kng_rc"
+		;;
+	*"YK1")
+		name="youku-yk1"
+		;;
 	*)
 		name="generic"
 		;;
@@ -465,5 +696,5 @@ ramips_board_name() {
 	[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
 	[ -z "$name" ] && name="unknown"
 
-	echo "$name"
+	echo "${name%-[0-9]*M}"
 }