From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 27 May 2012 13:22:11 +0000 (+0000)
Subject: bcm63xx: move the board name workaround to /lib/brcm63xx.sh
X-Git-Tag: v19.07.0-rc1~24474
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=72b4fdecc9bb33aea7b6a58dcefd4553d093f266;p=openwrt%2Fstaging%2Fhauke.git

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

SVN-Revision: 31872
---

diff --git a/target/linux/brcm63xx/base-files/etc/init.d/defconfig b/target/linux/brcm63xx/base-files/etc/init.d/defconfig
index 8fd783d4d6..a49c32785d 100755
--- 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 488aed874f..e4ac5e331d 100755
--- 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"