X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Framips.sh;h=22c9885f390983dd387656de069dd53825c2582a;hb=00f429757bee0996f40f2c4046c572afad0a3f3f;hp=83dcc0e485ecddc7cef2a42d2601d6f63a39f8c8;hpb=86d2c52f52c503c83ae88078fa21da5e2fa061c0;p=openwrt.git

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 83dcc0e485..22c9885f39 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -1,46 +1,12 @@
 #!/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
-
-	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
-}
-
-ramips_board_name() {
+ramips_board_detect() {
 	local machine
 	local name
 
@@ -53,9 +19,15 @@ 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"
 		;;
@@ -65,6 +37,9 @@ ramips_board_name() {
 	*"Allnet ALL5002")
 		name="all5002"
 		;;
+	*"Allnet ALL5003")
+		name="all5003"
+		;;
 	*"ARC FreeStation5")
 		name="freestation5"
 		;;
@@ -80,6 +55,9 @@ ramips_board_name() {
 	*"Asus WL-330N3G")
 		name="wl-330n3g"
 		;;
+	*"Alpha ASL26555")
+		name="asl26555"
+		;;
 	*"Aztech HW550-3G")
 		name="hw550-3g"
 		;;
@@ -95,6 +73,9 @@ ramips_board_name() {
 	*"DIR-620 A1")
 		name="dir-620-a1"
 		;;
+	*"DIR-620 D1")
+		name="dir-620-d1"
+		;;
 	*"DIR-615 H1")
 		name="dir-615-h1"
 		;;
@@ -104,12 +85,15 @@ ramips_board_name() {
 	*"DIR-645")
 		name="dir-645"
 		;;
-        *"DAP-1350")
-                name="dap-1350"
-                ;;
+	*"DAP-1350")
+		name="dap-1350"
+		;;
 	*"ESR-9753")
 		name="esr-9753"
 		;;
+	*"F7C027")
+		name="f7c027"
+		;;
 	*"F5D8235 v1")
 		name="f5d8235-v1"
 		;;
@@ -119,6 +103,9 @@ ramips_board_name() {
 	*"Hauppauge Broadway")
 		name="broadway"
 		;;
+	*"Huawei D105")
+		name="d105"
+		;;
 	*"La Fonera 2.0N")
 		name="fonera20n"
 		;;
@@ -128,15 +115,24 @@ ramips_board_name() {
 	*"MoFi Network MOFI3500-3GN")
 		name="mofi3500-3gn"
 		;;
+	*"HAME MPR-A2")
+ 		name="mpr-a2"
+ 		;;
 	*"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"
 		;;
@@ -188,6 +184,9 @@ ramips_board_name() {
 	*"Tenda W306R V2.0")
 		name="w306r-v20"
 		;;
+	*"Tenda W150M")
+		name="w150m"
+		;;
 	*"TEW-691GR")
 		name="tew-691gr"
 		;;
@@ -206,6 +205,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"
 		;;
@@ -215,10 +217,28 @@ ramips_board_name() {
 	*"XDX RN502J")
 		name="xdxrn502j"
 		;;
+	*"HG255D")
+		name="hg255d"
+		;;
 	*)
 		name="generic"
 		;;
 	esac
 
-	echo $name
+	[ -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"
 }