From e0ccfea057eed40dc794608c92d58fffd0e8b1af Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 5 Feb 2013 22:25:30 +0000 Subject: [PATCH] [brcm63xx] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35504 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm63xx/base-files/lib/brcm63xx.sh | 1 + .../base-files/lib/preinit/05_init_interfaces_brcm63xx | 4 ---- .../brcm63xx/base-files/lib/preinit/05_reset_button_brcm63xx | 2 -- 3 files changed, 1 insertion(+), 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