X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Framips.sh;h=ca71ef3b845f8f10df2ede33de598303d7903968;hp=3342a8f0c40b673199b41601ca78e3087c321e59;hb=8e40fbff0b414a3920eaa92be62152c708c1c1c5;hpb=3cfc909c54c07d5a24d9a1a7496142b82d580878

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 3342a8f0c4..ca71ef3b84 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -3,9 +3,6 @@
 # Copyright (C) 2010-2013 OpenWrt.org
 #
 
-RAMIPS_BOARD_NAME=
-RAMIPS_MODEL=
-
 ramips_board_detect() {
 	local machine
 	local name
@@ -37,9 +34,6 @@ ramips_board_detect() {
 	*"Air3GII")
 		name="air3gii"
 		;;
-	*"ALL0239-3G")
-		name="all0239-3g"
-		;;
 	*"ALL0256N (4M)")
 		name="all0256n-4M"
 		;;
@@ -76,14 +70,11 @@ ramips_board_detect() {
 	*"AWM002 EVB (8M)")
 		name="awm002-evb-8M"
 		;;
-	*"AWM003 EVB")
-		name="awm003-evb"
-		;;
 	*"BC2")
 		name="bc2"
 		;;
-	*"BR-6425")
-		name="br-6425"
+	*"BOCCO")
+		name="bocco"
 		;;
 	*"BR-6475nD")
 		name="br-6475nd"
@@ -91,6 +82,9 @@ ramips_board_detect() {
 	*"Broadway")
 		name="broadway"
 		;;
+	*"C108")
+		name="c108"
+		;;
 	*"C20i")
 		name="c20i"
 		;;
@@ -187,7 +181,7 @@ ramips_board_detect() {
 	*"EX2700")
 		name="ex2700";
 		;;
-	*"EX3700")
+	*"EX3700/EX3800")
 		name="ex3700"
 		;;
 	*"F5D8235 v1")
@@ -217,6 +211,9 @@ ramips_board_detect() {
 	*"GL-MT750")
 		name="gl-mt750"
 		;;
+	*"GL-MT300N-V2")
+		name="gl-mt300n-v2"
+		;;
 	*"HC5661")
 		name="hc5661"
 		;;
@@ -259,6 +256,9 @@ ramips_board_detect() {
 	*"JHR-N926R")
 		name="jhr-n926r"
 		;;
+	*"K2P")
+		name="k2p"
+		;;
 	*"M3")
 		name="m3"
 		;;
@@ -269,19 +269,16 @@ ramips_board_detect() {
 		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
+		name="linkits7688"
 		;;
 	*"Memory 2 Move")
 		name="m2m"
 		;;
 	*"Mercury MAC1200R v2")
-		name="mac1200r-v2"
+		name="mac1200rv2"
+		;;
+	*"Mi Router 3G")
+		name="mir3g"
 		;;
 	*"MicroWRT")
 		name="microwrt"
@@ -421,6 +418,9 @@ ramips_board_detect() {
 	*"RB750Gr3")
 		name="rb750gr3"
 		;;
+	*"RE350 v1")
+		name="re350-v1"
+		;;
 	*"RE6500")
 		name="re6500"
 		;;
@@ -436,12 +436,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"
 		;;
@@ -466,6 +472,9 @@ ramips_board_detect() {
 	*"SL-R7205"*)
 		name="sl-r7205"
 		;;
+	*"TEW-638APB v2")
+		name="tew-638apb-v2"
+		;;
 	*"TEW-691GR")
 		name="tew-691gr"
 		;;
@@ -478,9 +487,27 @@ 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"
+		;;
+	*"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"
 		;;
@@ -502,6 +529,9 @@ ramips_board_detect() {
 	*"VoCore2")
 		name="vocore2"
 		;;
+	*"VoCore2-Lite")
+		name="vocore2lite"
+		;;
 	*"VR500")
 		name="vr500"
 		;;
@@ -523,6 +553,9 @@ ramips_board_detect() {
 	*"WCR-150GN")
 		name="wcr-150gn"
 		;;
+	*"WE1026-5G (16M)")
+		name="we1026-5g-16m"
+		;;
 	*"WF-2881")
 		name="wf-2881"
 		;;
@@ -538,12 +571,6 @@ ramips_board_detect() {
 	*"WHR-G300N")
 		name="whr-g300n"
 		;;
-	*"Widora-NEO")
-		name="widora-neo"
-		;;
-	*"WiTi")
-                name="witi"
-		;;
 	*"WIZARD 8800")
 		name="wizard8800"
 		;;
@@ -556,9 +583,6 @@ ramips_board_detect() {
 	*"WL-330N3G")
 		name="wl-330n3g"
 		;;
-	*"WL-341 v3")
-		name="wl-341v3"
-		;;
 	*"WL-351 v1 002")
 		name="wl-351"
 		;;
@@ -571,6 +595,9 @@ ramips_board_detect() {
 	*"WLR-6000")
 		name="wlr-6000"
 		;;
+	*"WMDR-143N")
+		name="wmdr-143n"
+		;;
 	*"WMR-300")
 		name="wmr-300"
 		;;
@@ -652,8 +679,11 @@ ramips_board_detect() {
 	*"ZBT-WE2026")
 		name="zbt-we2026"
 		;;
-	*"ZBT-WE826")
-		name="zbt-we826"
+	*"ZBT-WE826 (16M)")
+		name="zbt-we826-16M"
+		;;
+	*"ZBT-WE826 (32M)")
+		name="zbt-we826-32M"
 		;;
 	*"ZBT-WG2626")
 		name="zbt-wg2626"
@@ -667,6 +697,9 @@ ramips_board_detect() {
 	*"ZBT-WR8305RT")
 		name="zbt-wr8305rt"
 		;;
+	*"ZyXEL Keenetic")
+		name="kn"
+		;;
 	*"ZyXEL Keenetic Omni")
 		name="kn_rc"
 		;;
@@ -679,25 +712,13 @@ ramips_board_detect() {
 	*"YK1")
 		name="youku-yk1"
 		;;
-	*)
-		name="generic"
-		;;
 	esac
 
-	[ -z "$RAMIPS_BOARD_NAME" ] && RAMIPS_BOARD_NAME="$name"
-	[ -z "$RAMIPS_MODEL" ] && RAMIPS_MODEL="$machine"
+	# use generic board detect if no name is set
+	[ -z "$name" ] && return
 
 	[ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
 
-	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}"
+	echo "$name" > /tmp/sysinfo/board_name
+	echo "$machine" > /tmp/sysinfo/model
 }