X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Framips.sh;h=bf19a4c570c2a3f69463b12b9e056a7221b70867;hp=c62f5f6a9389330b566e78cea88e878e2cba1350;hb=58e0673900ea585b03d3cc2f8917667faa3f977f;hpb=3d680c57286a2f77b9cfba275756c711730c7fe2

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index c62f5f6a93..bf19a4c570 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,24 +70,27 @@ ramips_board_detect() {
 	*"AWAPN2403")
 		name="awapn2403"
 		;;
-	*"AWM002 EVB")
-		name="awm002-evb"
+	*"AWM002 EVB (4M)")
+		name="awm002-evb-4M"
 		;;
-	*"AWM003 EVB")
-		name="awm003-evb"
+	*"AWM002 EVB (8M)")
+		name="awm002-evb-8M"
 		;;
 	*"BC2")
 		name="bc2"
 		;;
-	*"BR-6425")
-		name="br-6425"
-		;;
 	*"BR-6475nD")
 		name="br-6475nd"
 		;;
 	*"Broadway")
 		name="broadway"
 		;;
+	*"C108")
+		name="c108"
+		;;
+	*"C20")
+		name="c20"
+		;;
 	*"C20i")
 		name="c20i"
 		;;
@@ -100,6 +112,9 @@ ramips_board_detect() {
 	*"D105")
 		name="d105"
 		;;
+	*"D240")
+		name="d240"
+		;;
 	*"DAP-1350")
 		name="dap-1350"
 		;;
@@ -115,9 +130,6 @@ ramips_board_detect() {
 	*"DCS-930L B1")
 		name="dcs-930l-b1"
 		;;
-	*"Digineo AC1200 Pro")
-		name="ac1200pro"
-		;;
 	*"DIR-300 B1")
 		name="dir-300-b1"
 		;;
@@ -130,9 +142,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"
 		;;
@@ -163,15 +172,24 @@ ramips_board_detect() {
 	*"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/EX3800")
+		name="ex3700"
+		;;
 	*"F5D8235 v1")
 		name="f5d8235-v1"
 		;;
@@ -190,6 +208,9 @@ ramips_board_detect() {
 	*"FreeStation5")
 		name="freestation5"
 		;;
+	*"GB-PC1")
+		name="gb-pc1"
+		;;
 	*"GL-MT300A")
 		name="gl-mt300a"
 		;;
@@ -199,15 +220,24 @@ ramips_board_detect() {
 	*"GL-MT750")
 		name="gl-mt750"
 		;;
+	*"GL-MT300N-V2")
+		name="gl-mt300n-v2"
+		;;
 	*"HC5661")
 		name="hc5661"
 		;;
+	*"HC5661A")
+		name="hc5661a"
+		;;
 	*"HC5761")
 		name="hc5761"
 		;;
 	*"HC5861")
 		name="hc5861"
 		;;
+	*"HC5962")
+		name="hc5962"
+		;;
 	*"HG255D")
 		name="hg255d"
 		;;
@@ -235,11 +265,17 @@ ramips_board_detect() {
 	*"JHR-N926R")
 		name="jhr-n926r"
 		;;
+	*"K2P")
+		name="k2p"
+		;;
 	*"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)"
@@ -256,6 +292,9 @@ ramips_board_detect() {
 	*"Mercury MAC1200R v2")
 		name="mac1200rv2"
 		;;
+	*"Mi Router 3G")
+		name="mir3g"
+		;;
 	*"MicroWRT")
 		name="microwrt"
 		;;
@@ -289,6 +328,9 @@ ramips_board_detect() {
 	*"MR-102N")
 		name="mr-102n"
 		;;
+	*"MR200")
+		name="mr200"
+		;;
 	*"MT7620a + MT7530 evaluation"*)
 		name="mt7620a_mt7530"
 		;;
@@ -337,12 +379,21 @@ ramips_board_detect() {
 	*"NCS601W")
 		name="ncs601w"
 		;;
-	*"NixcoreX1")
-		name="nixcore-x1"
+	*"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"
 		;;
@@ -355,8 +406,11 @@ ramips_board_detect() {
 	*"PSG1208")
 		name="psg1208"
 		;;
-	*"PSG1218")
-		name="psg1218"
+	*"PSG1218 rev.A")
+		name="psg1218a"
+		;;
+	*"PSG1218 rev.B")
+		name="psg1218b"
 		;;
 	*"PSR-680W"*)
 		name="psr-680w"
@@ -364,15 +418,24 @@ ramips_board_detect() {
 	*"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"
 		;;
+	*"RE350 v1")
+		name="re350-v1"
+		;;
 	*"RE6500")
 		name="re6500"
 		;;
@@ -388,12 +451,18 @@ ramips_board_detect() {
 	*"RT5350F-OLinuXino-EVB")
 		name="rt5350f-olinuxino-evb"
 		;;
+	*"RT-AC51U")
+		name="rt-ac51u"
+		;;
 	*"RT-G32 B1")
 		name="rt-g32-b1"
 		;;
 	*"RT-N10+")
 		name="rt-n10-plus"
 		;;
+	*"RT-N12+")
+		name="rt-n12p"
+		;;
 	*"RT-N13U")
 		name="rt-n13u"
 		;;
@@ -418,6 +487,9 @@ ramips_board_detect() {
 	*"SL-R7205"*)
 		name="sl-r7205"
 		;;
+	*"TEW-638APB v2")
+		name="tew-638apb-v2"
+		;;
 	*"TEW-691GR")
 		name="tew-691gr"
 		;;
@@ -430,9 +502,30 @@ ramips_board_detect() {
 	*"Timecloud")
 		name="timecloud"
 		;;
+	*"TL-WR840N v4")
+		name="tl-wr840n-v4"
+		;;
+	*"TL-WR840N v5")
+		name="tl-wr840n-v5"
+		;;
+	*"TL-WR841N v13")
+		name="tl-wr841n-v13"
+		;;
+	*"U25AWF-H1")
+		name="u25awf-h1"
+		;;
+	*"U7621-06 (256M RAM/16M flash)")
+		name="u7621-06-256M-16M"
+		;;
+	*"U7628-01 (128M RAM/16M flash)")
+		name="u7628-01-128M-16M"
+		;;
 	*"UBNT-ERX")
 		name="ubnt-erx"
 		;;
+	*"UBNT-ERX-SFP")
+		name="ubnt-erx-sfp"
+		;;
 	*"UR-326N4G")
 		name="ur-326n4g"
 		;;
@@ -445,8 +538,17 @@ ramips_board_detect() {
 	*"V22RW-2X2")
 		name="v22rw-2x2"
 		;;
-	*"VoCore")
-		name="vocore"
+	*"VoCore (8M)")
+		name="vocore-8M"
+		;;
+	*"VoCore (16M)")
+		name="vocore-16M"
+		;;
+	*"VoCore2")
+		name="vocore2"
+		;;
+	*"VoCore2-Lite")
+		name="vocore2lite"
 		;;
 	*"VR500")
 		name="vr500"
@@ -454,15 +556,24 @@ ramips_board_detect() {
 	*"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"
 		;;
+	*"WE1026-5G (16M)")
+		name="we1026-5g-16m"
+		;;
 	*"WF-2881")
 		name="wf-2881"
 		;;
@@ -511,17 +622,26 @@ ramips_board_detect() {
 	*"WLR-6000")
 		name="wlr-6000"
 		;;
+	*"WMDR-143N")
+		name="wmdr-143n"
+		;;
 	*"WMR-300")
 		name="wmr-300"
 		;;
+	*"WN3000RPv3")
+		name="wn3000rpv3"
+		;;
 	*"WNCE2001")
 		name="wnce2001"
 		;;
 	*"WNDR3700v5")
 		name="wndr3700v5"
 		;;
-	*"WR512-3GN-like"*)
-		name="wr512-3gn"
+	*"WR512-3GN (4M)")
+		name="wr512-3gn-4M"
+		;;
+	*"WR512-3GN (8M)")
+		name="wr512-3gn-8M"
 		;;
 	*"WR6202")
 		name="wr6202"
@@ -544,11 +664,17 @@ ramips_board_detect() {
 	*"WSR-600DHP")
 		name="wsr-600"
 		;;
-	*"WT1520")
-		name="wt1520"
+	*"WT1520 (4M)")
+		name="wt1520-4M"
 		;;
-	*"WT3020")
-		name="wt3020"
+	*"WT1520 (8M)")
+		name="wt1520-8M"
+		;;
+	*"WT3020 (4M)")
+		name="wt3020-4M"
+		;;
+	*"WT3020 (8M)")
+		name="wt3020-8M"
 		;;
 	*"WZR-AGL300NH")
 		name="wzr-agl300nh"
@@ -574,23 +700,49 @@ ramips_board_detect() {
 	*"ZBT-WA05")
 		name="zbt-wa05"
 		;;
-	*"ZBT-WE826")
-		name="zbt-we826"
+	*"ZBT-WE1326")
+		name="zbt-we1326"
+		;;
+	*"ZBT-WE2026")
+		name="zbt-we2026"
+		;;
+	*"ZBT-WE826 (16M)")
+		name="zbt-we826-16M"
+		;;
+	*"ZBT-WE826 (32M)")
+		name="zbt-we826-32M"
 		;;
 	*"ZBT-WG2626")
 		name="zbt-wg2626"
 		;;
-	*"ZBT-WG3526")
-		name="zbt-wg3526"
+	*"ZBT-WG3526 (16M)")
+		name="zbt-wg3526-16M"
+		;;
+	*"ZBT-WG3526 (32M)")
+		name="zbt-wg3526-32M"
 		;;
 	*"ZBT-WR8305RT")
 		name="zbt-wr8305rt"
 		;;
+	*"ZyXEL Keenetic")
+		name="kn"
+		;;
+	*"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"
+		name="$(strings /proc/device-tree/compatible | head -1)"
+		name="${name##*,}"
+		name="${name:-generic}"
 		;;
 	esac
 
@@ -602,12 +754,3 @@ ramips_board_detect() {
 	echo "$RAMIPS_BOARD_NAME" > /tmp/sysinfo/board_name
 	echo "$RAMIPS_MODEL" > /tmp/sysinfo/model
 }
-
-ramips_board_name() {
-	local name
-
-	[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
-	[ -z "$name" ] && name="unknown"
-
-	echo "$name"
-}