bcm63xx: move the board name workaround to /lib/brcm63xx.sh

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

diff --git a/target/linux/brcm63xx/base-files/etc/init.d/defconfig b/target/linux/brcm63xx/base-files/etc/init.d/defconfig
index 8fd783d..a49c327 100755 (executable)
--- a/target/linux/brcm63xx/base-files/etc/init.d/defconfig
+++ b/target/linux/brcm63xx/base-files/etc/init.d/defconfig
@@ -6,17 +6,13 @@
 START=05
 
 start() {
-       local board=$(awk 'BEGIN{FS="[ \t:/]+"} /system type/ {print $4}' /proc/cpuinfo)
+       . /lib/brcm63xx.sh
 
-       if [ "$board" = "96358VW" ] && [ -e /proc/switch/eth1/enable ]; then
-               board="DVAG3810BN"
-       fi
+       [ ! -d /etc/defconfig/$board_name ] && board_name="generic"
 
-       [ ! -d /etc/defconfig/$board ] && board="generic"
-
-       for f in $( ls /etc/defconfig/$board ); do
+       for f in $( ls /etc/defconfig/$board_name ); do
                if [ ! -e /etc/config/$f ]; then
-                       cp /etc/defconfig/$board/$f /etc/config/
+                       cp /etc/defconfig/$board_name/$f /etc/config/
                fi
        done
 }

diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index 488aed8..e4ac5e3 100755 (executable)
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -13,6 +13,10 @@ brcm63xx_has_reset_button=""
 brcm63xx_detect() {
        board_name=$(awk 'BEGIN{FS="[ \t:/]+"} /system type/ {print $4}' /proc/cpuinfo)
 
+       if [ "$board_name" = "96358VW" ] && [ -e /proc/switch/eth1/enable ]; then
+               board_name="DVAG3810BN"
+       fi
+
        case "$board_name" in
        96348GW)
                status_led="power"