From 5177814ade6673626af91676f3c586a723bf8022 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 5 Dec 2011 12:56:20 +0000 Subject: [PATCH] ar71xx: change user-space board detection SVN-Revision: 29432 --- target/linux/ar71xx/base-files/lib/ar71xx.sh | 29 +++++++++++++++---- .../lib/preinit/03_preinit_do_ar71xx.sh | 2 ++ 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 314b44e472..02286e9aab 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 367648929b..ff5407a0d4 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 -- 2.25.1