remove superfluous calls to /lib/brcm63xx.sh

The first preinit script 03_do_brcm63xx.sh does the right job of
exporting variables for the other subsequent preinit scripts to use
them.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 35504

diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index 87b2063dbdb1a1f14f5e3288ba0352b3d1ad194a..d3ad1b6e0b411be72f1a97c226c61b12395b7974 100755 (executable)
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -9,6 +9,7 @@ status_led=""
 status_led2=""
 sys_mtd_part=""
 brcm63xx_has_reset_button=""
+ifname=""
 
 brcm63xx_detect() {
        board_name=$(awk 'BEGIN{FS="[ \t:/]+"} /system type/ {print $4}' /proc/cpuinfo)

diff --git a/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx b/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx
index 0f85f4b95a628b64d5e0d3744579db72c102827b..1de59b79c0665be47971c1357fc22aea7534921e 100644 (file)
--- a/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx
+++ b/target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx
@@ -1,10 +1,6 @@
 #!/bin/sh
 
 set_preinit_iface() {
-       ifname=eth1
-
-       . /lib/brcm63xx.sh      
-
        ifconfig $ifname 0.0.0.0 up
 }
 

diff --git a/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx b/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx
index f6bfbdec30fb07d6a0349d2f5231e7bfeba6998a..0dfca73c220509520cd4f45e86517f508e560a23 100644 (file)
--- a/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx
+++ b/target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. /lib/brcm63xx.sh
-
 enable_reset_button() {
        if [ "$brcm63xx_has_reset_button" = "true" ]; then
                insmod input-core