X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Framips.sh;h=ca71ef3b845f8f10df2ede33de598303d7903968;hb=8e40fbff0b414a3920eaa92be62152c708c1c1c5;hp=fe66a87c2e3c8ec550ab10ba002c7c675b79efb8;hpb=6e283cdc0da25928f8148805ebef7f8f2b769ee8;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index fe66a87c2e..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"
 		;;
@@ -79,12 +73,18 @@ ramips_board_detect() {
 	*"BC2")
 		name="bc2"
 		;;
+	*"BOCCO")
+		name="bocco"
+		;;
 	*"BR-6475nD")
 		name="br-6475nd"
 		;;
 	*"Broadway")
 		name="broadway"
 		;;
+	*"C108")
+		name="c108"
+		;;
 	*"C20i")
 		name="c20i"
 		;;
@@ -202,9 +202,6 @@ ramips_board_detect() {
 	*"FreeStation5")
 		name="freestation5"
 		;;
-	*"GB-PC1")
-		name="gb-pc1"
-		;;
 	*"GL-MT300A")
 		name="gl-mt300a"
 		;;
@@ -272,13 +269,7 @@ 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"
@@ -454,6 +445,9 @@ ramips_board_detect() {
 	*"RT-N10+")
 		name="rt-n10-plus"
 		;;
+	*"RT-N12+")
+		name="rt-n12p"
+		;;
 	*"RT-N13U")
 		name="rt-n13u"
 		;;
@@ -496,9 +490,18 @@ ramips_board_detect() {
 	*"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"
 		;;
@@ -550,6 +553,9 @@ ramips_board_detect() {
 	*"WCR-150GN")
 		name="wcr-150gn"
 		;;
+	*"WE1026-5G (16M)")
+		name="we1026-5g-16m"
+		;;
 	*"WF-2881")
 		name="wf-2881"
 		;;
@@ -565,12 +571,6 @@ ramips_board_detect() {
 	*"WHR-G300N")
 		name="whr-g300n"
 		;;
-	*"Widora-NEO")
-		name="widora-neo"
-		;;
-	*"WiTi")
-                name="witi"
-		;;
 	*"WIZARD 8800")
 		name="wizard8800"
 		;;
@@ -583,9 +583,6 @@ ramips_board_detect() {
 	*"WL-330N3G")
 		name="wl-330n3g"
 		;;
-	*"WL-341 v3")
-		name="wl-341v3"
-		;;
 	*"WL-351 v1 002")
 		name="wl-351"
 		;;
@@ -715,16 +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
+	echo "$name" > /tmp/sysinfo/board_name
+	echo "$machine" > /tmp/sysinfo/model
 }