ar71xx: change user-space board detection

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29432 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 314b44e..02286e9 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 #
 #!/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
 
        local machine
        local name
 


@@ -199,10 +202,24 @@ ar71xx_board_name() {
        *ZCN-1523H-5)
                name="zcn-1523h-5"
                ;;
        *ZCN-1523H-5)
                name="zcn-1523h-5"
                ;;

-       *)
-               name="generic"
-               ;;

        esac
 
        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 3676489..ff5407a 100644 (file)
--- 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
 
 do_ar71xx() {
        . /lib/ar71xx.sh

+
+       ar71xx_board_detect

 }
 
 boot_hook_add preinit_main do_ar71xx
 }
 
 boot_hook_add preinit_main do_ar71xx