X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Framips.sh;h=c1355bcadc8a8e11b0cf40e55cd3c5e2f7bdb544;hb=7bfab6e308a54d4fc2b99d9f80b4a4cd735de5b1;hp=ce31b46b851065d38e5eece3d9040493d4aa7bb6;hpb=d3c368c324d3ffaeb5b1bad6aa3402b2bfed7c8e;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 ce31b46b85..c1355bcadc 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -1,46 +1,26 @@
 #!/bin/sh
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2013 OpenWrt.org
 #
 
-ramips_get_mac_binary()
-{
-	local mtdname="$1"
-	local seek="$2"
-	local part
+RAMIPS_BOARD_NAME=
+RAMIPS_MODEL=
 
-	. /lib/functions.sh
+all500x_board_detect() {
+	local systype
 
-	part=$(find_mtd_part "$mtdname")
-	if [ -z "$part" ]; then
-		echo "ramips_get_mac_binary: partition $mtdname not found!" >&2
-		return
-	fi
-
-	dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac
-}
-
-ramips_get_mac_nvram()
-{
-	local mtdname="$1"
-	local key="$2"
-	local part
-	local mac_dirty
-
-	. /lib/functions.sh
-
-	part=$(find_mtd_part "$mtdname")
-	if [ -z "$part" ]; then
-		echo "ramips_get_mac_nvram: partition $mtdname not found!" >&2
-		return
-	fi
-
-	mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p')
-	# "canonicalize" mac
-	/usr/sbin/maccalc add "$mac_dirty" 0
+	systype=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /system type/ {print $2}' /proc/cpuinfo)
+	case "$systype" in
+	*"RT5350"*)
+		RAMIPS_MODEL="Allnet ALL5003"
+		;;
+	*"RT3352"*)
+		RAMIPS_MODEL="Allnet ALL5002"
+		;;
+	esac
 }
 
-ramips_board_name() {
+ramips_board_detect() {
 	local machine
 	local name
 
@@ -53,13 +33,22 @@ ramips_board_name() {
 	*"Edimax 3g-6200n")
 		name="3g-6200n"
 		;;
+	*"Edimax 3g-6200nl")
+		name="3g-6200nl"
+		;;
+	*"AirLive Air3GII")
+		name="air3gii"
+		;;
+	*"Edimax BR-6425")
+		name="br6425"
+		;;
 	*"Allnet ALL0239-3G")
 		name="all0239-3g"
 		;;
 	*"Allnet ALL0256N")
 		name="all0256n"
 		;;
-	*"Allnet ALL5002")
+	*"Allnet ALL5002/ALL5003")
 		name="all5002"
 		;;
 	*"ARC FreeStation5")
@@ -68,12 +57,18 @@ ramips_board_name() {
 	*"Argus ATP-52B")
 		name="argus-atp52b"
 		;;
+	*"BR6524N")
+		name="br6524n"
+		;;
 	*"Asus WL-330N")
 		name="wl-330n"
 		;;
 	*"Asus WL-330N3G")
 		name="wl-330n3g"
 		;;
+	*"Alpha ASL26555")
+		name="asl26555"
+		;;
 	*"Aztech HW550-3G")
 		name="hw550-3g"
 		;;
@@ -89,15 +84,21 @@ ramips_board_name() {
 	*"DIR-620 A1")
 		name="dir-620-a1"
 		;;
+	*"DIR-620 D1")
+		name="dir-620-d1"
+		;;
 	*"DIR-615 H1")
 		name="dir-615-h1"
 		;;
+	*"DIR-615 D")
+		name="dir-615-d"
+		;;
 	*"DIR-645")
 		name="dir-645"
 		;;
-        *"DAP-1350")
-                name="dap-1350"
-                ;;
+	*"DAP-1350")
+		name="dap-1350"
+		;;
 	*"ESR-9753")
 		name="esr-9753"
 		;;
@@ -107,27 +108,45 @@ ramips_board_name() {
 	*"F5D8235 v2")
 		name="f5d8235-v2"
 		;;
+	*"Hauppauge Broadway")
+		name="broadway"
+		;;
+	*"Huawei D105")
+		name="d105"
+		;;
 	*"La Fonera 2.0N")
 		name="fonera20n"
 		;;
+	*"Asus RT-N13U")
+		name="rt-n13u"
+		;;
 	*"MoFi Network MOFI3500-3GN")
 		name="mofi3500-3gn"
 		;;
 	*"NBG-419N")
 		name="nbg-419n"
 		;;
+	*"Netgear WNCE2001")
+		name="wnce2001"
+		;;
 	*"NexAira BC2")
 		name="bc2"
 		;;
 	*"NW718")
 		name="nw718"
 		;;
+	*"Omnima EMB HPM")
+		name="omni-emb-hpm"
+		;;
 	*"Omnima MiniEMBWiFi")
 		name="omni-emb"
 		;;
 	*"Petatel PSR-680W"*)
 		name="psr-680w"
 		;;
+	*"Planex MZK-W300NH2"*)
+		name="mzk-w300nh2"
+		;;
 	*"PWH2004")
 		name="pwh2004"
 		;;
@@ -164,9 +183,18 @@ ramips_board_name() {
 	*"Sitecom WL-351 v1 002")
 		name="wl-351"
 		;;
+	*"Tenda 3G300M")
+		name="3g300m"
+		;;
 	*"Tenda W306R V2.0")
 		name="w306r-v20"
 		;;
+	*"Tenda W150M")
+		name="w150m"
+		;;
+	*"TEW-691GR")
+		name="tew-691gr"
+		;;
 	*"TEW-692GR")
 		name="tew-692gr"
 		;;
@@ -182,6 +210,9 @@ ramips_board_name() {
 	*"WR512-3GN-like router")
 		name="wr512-3gn"
 		;;
+	*"UR-326N4G Wireless N router")
+		name="ur-326n4g"
+ 		;;
 	*"UR-336UN Wireless N router")
 		name="ur-336un"
 		;;
@@ -196,5 +227,26 @@ ramips_board_name() {
 		;;
 	esac
 
-	echo $name
+	case "$machine" in
+	*"Allnet ALL5002/ALL5003")
+		all500x_board_detect
+		;;
+	esac
+
+	[ -z "$RAMIPS_BOARD_NAME" ] && RAMIPS_BOARD_NAME="$name"
+	[ -z "$RAMIPS_MODEL" ] && RAMIPS_MODEL="$machine"
+
+	[ -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"
 }