summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-05 12:56:20 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-05 12:56:20 +0000
commit1f7d4ca40756aa509440e364cb03e5f7766ec258 (patch)
tree2e0cbebea69755e84d578a45776b0ac5ae1262b7
parent71573bb739449d1001f5d4a6dcc697215d9b3207 (diff)
ar71xx: change user-space board detection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29432 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/linux/ar71xx/base-files/lib/ar71xx.sh29
-rw-r--r--target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh2
2 files changed, 25 insertions, 6 deletions
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 314b44e47..02286e9aa 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -1,9 +1,12 @@
#!/bin/sh
#
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
#
-ar71xx_board_name() {
+AR71XX_BOARD_NAME=
+AR71XX_MODEL=
+
+ar71xx_board_detect() {
local machine
local name
@@ -199,10 +202,24 @@ ar71xx_board_name() {
*ZCN-1523H-5)
name="zcn-1523h-5"
;;
- *)
- name="generic"
- ;;
esac
- echo $name
+ [ -z "$name" ] && name="unknown"
+
+ [ -z "$AR71XX_BOARD_NAME" ] && AR71XX_BOARD_NAME="$name"
+ [ -z "$AR71XX_MODEL" ] && AR71XX_MODEL="$machine"
+
+ [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
+
+ echo "$AR71XX_BOARD_NAME" > /tmp/sysinfo/board_name
+ echo "$AR71XX_MODEL" > /tmp/sysinfo/model
+}
+
+ar71xx_board_name() {
+ local name
+
+ [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
+ [ -z "$name" ] && name="unknown"
+
+ echo "$name"
}
diff --git a/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh b/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh
index 367648929..ff5407a0d 100644
--- a/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/preinit/03_preinit_do_ar71xx.sh
@@ -2,6 +2,8 @@
do_ar71xx() {
. /lib/ar71xx.sh
+
+ ar71xx_board_detect
}
boot_hook_add preinit_main do_ar71xx