aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-02-05 22:25:30 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-02-05 22:25:30 +0000
commit57803a98ec851b52f754138267ad81c66afa28a4 (patch)
tree8fc26ac3eccb59d994ef789b8623d97a7292ec82
parent84d306d23c5c9cfe9023204a6997b30a9e4ee9a9 (diff)
downloadupstream-57803a98ec851b52f754138267ad81c66afa28a4.tar.gz
upstream-57803a98ec851b52f754138267ad81c66afa28a4.tar.bz2
upstream-57803a98ec851b52f754138267ad81c66afa28a4.zip
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
-rwxr-xr-xtarget/linux/brcm63xx/base-files/lib/brcm63xx.sh1
-rw-r--r--target/linux/brcm63xx/base-files/lib/preinit/05_init_interfaces_brcm63xx4
-rw-r--r--target/linux/brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx2
3 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index 87b2063dbd..d3ad1b6e0b 100755
--- 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 0f85f4b95a..1de59b79c0 100644
--- 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 f6bfbdec30..0dfca73c22 100644
--- 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