treewide: use the generic board_name function
authorMathias Kresin <dev@kresin.me>
Fri, 12 May 2017 20:36:07 +0000 (22:36 +0200)
committerMathias Kresin <dev@kresin.me>
Sat, 15 Jul 2017 21:13:34 +0000 (23:13 +0200)
Use the generic function instead ot the target specific ones.

Signed-off-by: Mathias Kresin <dev@kresin.me>
94 files changed:
package/boot/uboot-envtools/files/ar71xx
package/boot/uboot-envtools/files/cns3xxx
package/boot/uboot-envtools/files/imx6
package/boot/uboot-envtools/files/ipq
package/boot/uboot-envtools/files/kirkwood
package/boot/uboot-envtools/files/mvebu
package/boot/uboot-envtools/files/mxs
package/boot/uboot-envtools/files/oxnas
package/boot/uboot-envtools/files/ramips
package/kernel/om-watchdog/files/om-watchdog.init
target/linux/apm821xx/base-files/etc/board.d/01_leds
target/linux/apm821xx/base-files/etc/board.d/02_network
target/linux/apm821xx/base-files/etc/diag.sh
target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
target/linux/apm821xx/base-files/etc/rc.button/BTN_1
target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
target/linux/apm821xx/base-files/lib/upgrade/platform.sh
target/linux/ar71xx/base-files/etc/board.d/01_leds
target/linux/ar71xx/base-files/etc/board.d/02_network
target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches
target/linux/ar71xx/base-files/etc/diag.sh
target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-checksum
target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header
target/linux/ar71xx/base-files/lib/preinit/05_set_iface_mac_ar71xx
target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
target/linux/ar71xx/base-files/lib/preinit/82_patch_ath10k
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/arc770/base-files/etc/board.d/02_network
target/linux/archs38/base-files/etc/board.d/02_network
target/linux/at91/base-files/etc/board.d/02_network
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
target/linux/brcm2708/base-files/etc/board.d/02_network
target/linux/brcm2708/base-files/etc/diag.sh
target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
target/linux/brcm63xx/base-files/etc/board.d/01_leds
target/linux/brcm63xx/base-files/etc/board.d/02_network
target/linux/brcm63xx/base-files/etc/diag.sh
target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc
target/linux/imx6/base-files/etc/board.d/02_network
target/linux/imx6/base-files/lib/upgrade/platform.sh
target/linux/ipq806x/base-files/etc/board.d/01_leds
target/linux/ipq806x/base-files/etc/board.d/02_network
target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
target/linux/ipq806x/base-files/etc/init.d/linksys_recovery
target/linux/ipq806x/base-files/lib/upgrade/platform.sh
target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
target/linux/kirkwood/base-files/etc/board.d/01_leds
target/linux/kirkwood/base-files/etc/board.d/02_network
target/linux/kirkwood/base-files/etc/diag.sh
target/linux/kirkwood/base-files/etc/init.d/linksys_recovery
target/linux/kirkwood/base-files/etc/init.d/nsa310_fancontrol
target/linux/kirkwood/base-files/lib/upgrade/platform.sh
target/linux/mcs814x/base-files/etc/board.d/01_leds
target/linux/mpc85xx/base-files/etc/board.d/02_network
target/linux/mpc85xx/base-files/etc/diag.sh
target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
target/linux/mvebu/base-files/etc/board.d/01_leds
target/linux/mvebu/base-files/etc/board.d/02_network
target/linux/mvebu/base-files/etc/diag.sh
target/linux/mvebu/base-files/etc/init.d/linksys_recovery
target/linux/mvebu/base-files/etc/uci-defaults/03_wireless
target/linux/mvebu/base-files/etc/uci-defaults/04_mambafan
target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac
target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg
target/linux/mvebu/base-files/lib/upgrade/platform.sh
target/linux/mxs/base-files/etc/board.d/02_network
target/linux/mxs/base-files/etc/diag.sh
target/linux/oxnas/base-files/etc/board.d/01_leds
target/linux/oxnas/base-files/etc/board.d/02_network
target/linux/oxnas/base-files/etc/diag.sh
target/linux/oxnas/base-files/lib/upgrade/platform.sh
target/linux/ppc40x/base-files/lib/upgrade/platform.sh
target/linux/ramips/base-files/etc/board.d/01_leds
target/linux/ramips/base-files/etc/board.d/02_network
target/linux/ramips/base-files/etc/board.d/03_gpio_switches
target/linux/ramips/base-files/etc/diag.sh
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
target/linux/ramips/base-files/etc/init.d/bootcount
target/linux/ramips/base-files/etc/uci-defaults/09_fix-seama-header
target/linux/ramips/base-files/lib/preinit/04_handle_checksumming
target/linux/ramips/base-files/lib/upgrade/platform.sh
target/linux/ramips/base-files/sbin/fixup-mac-address
target/linux/sunxi/base-files/etc/board.d/02_network
target/linux/sunxi/base-files/lib/preinit/03_b53_hack.sh

index 503e593..5c7b16c 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/ar71xx.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$board" in
 a40|\
index a56be15..f998de4 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/cns3xxx.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(cns3xxx_board_name)
+board=$(board_name)
 
 case "$board" in
 laguna)
index a78c4fb..fec8ce0 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/imx6.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(imx6_board_name)
+board=$(board_name)
 
 case "$board" in
 *gw5*)
index 16c7ba6..5d0a477 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/ipq806x.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(ipq806x_board_name)
+board=$(board_name)
 
 case "$board" in
 ea8500)
index 26ae1b0..3b770c1 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/kirkwood.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(kirkwood_board_name)
+board=$(board_name)
 
 case "$board" in
 dockstar|\
index 2bbbc23..e33830e 100644 (file)
@@ -8,11 +8,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/mvebu.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(mvebu_board_name)
+board=$(board_name)
 
 case "$board" in
 armada-385-linksys-caiman|\
index ab8b4ef..37d3c96 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/mxs.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(mxs_board_name)
+board=$(board_name)
 
 case "$board" in
 duckbill)
index ac4744e..70b0f16 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/oxnas.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(oxnas_board_name)
+board=$(board_name)
 
 case "$board" in
 akitio|\
index 9ce8c30..fa80e95 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/ramips.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(ramips_board_name)
+board=$(board_name)
 
 case "$board" in
 all0239-3g|\
index 906ee66..10eb55c 100644 (file)
@@ -11,10 +11,9 @@ NAME=om-watchdog
 PROG=/sbin/om-watchdog
 
 get_gpio() {
-       if [ -r /lib/ar71xx.sh ]; then
-               . /lib/ar71xx.sh
-               local board=$(ar71xx_board_name)
+       local board=$(board_name)
 
+       if [ -r /lib/ar71xx.sh ]; then
                case "$board" in
                "a40"|\
                "a60"|\
@@ -49,9 +48,6 @@ get_gpio() {
                        ;;
                esac
        elif [ -r /lib/ramips.sh ]; then
-               . /lib/ramips.sh
-               local board=$(ramips_board_name)
-
                case "$board" in
                "rut5xx")
                        return 11
index ad9bef9..3b5fb72 100755 (executable)
@@ -1,11 +1,10 @@
 #!/bin/sh
 
 . /lib/functions/uci-defaults.sh
-. /lib/apm821xx.sh
 
 board_config_update
 
-board=$(apm821xx_board_name)
+board=$(board_name)
 
 case "$board" in
 mr24)
index 90a8c1a..03df7cb 100755 (executable)
@@ -2,11 +2,10 @@
 
 . /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
-. /lib/apm821xx.sh
 
 board_config_update
 
-board=$(apm821xx_board_name)
+board=$(board_name)
 
 case "$board" in
 mbl|\
index 3e480f1..eb9b04b 100755 (executable)
@@ -1,10 +1,10 @@
 #!/bin/sh
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/apm821xx.sh
 
 get_status_led() {
-       local board=$(apm821xx_board_name)
+       local board=$(board_name)
 
        case $board in
        mbl|\
index dfdc548..4a7e1c0 100644 (file)
@@ -2,7 +2,6 @@
 
 [ -e /lib/firmware/$FIRMWARE ] && exit 0
 
-. /lib/apm821xx.sh
 . /lib/functions.sh
 . /lib/functions/system.sh
 
@@ -48,7 +47,7 @@ ath9k_patch_firmware_mac() {
         macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6
 }
 
-board=$(apm821xx_board_name)
+board=$(board_name)
 
 case "$FIRMWARE" in
 "pci_wmac0.eeprom")
index 9956412..c011c85 100755 (executable)
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 . /lib/functions.sh
-. /lib/apm821xx.sh
 
-BOARD=$(apm821xx_board_name)
+BOARD=$(board_name)
 
 if [ $BOARD == "wndr4700" ]; then
        case "$ACTION" in
index 750af04..ec540fe 100644 (file)
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-. /lib/apm821xx.sh
-
 preinit_set_mac_address() {
-       case $(apm821xx_board_name) in
+       . /lib/functions.sh
+
+       case $(board_name) in
                mr24|\
                mx60)
                        mac_lan=$(mtd_get_mac_binary_ubi board-config 102)
index ca6aa8d..55f8ffa 100755 (executable)
@@ -1,12 +1,9 @@
 #!/bin/sh
 
-. /lib/apm821xx.sh
-
 PART_NAME=firmware
-RAMFS_COPY_DATA=/lib/apm821xx.sh
 
 platform_check_image() {
-       local board=$(apm821xx_board_name)
+       local board=$(board_name)
 
        [ "$#" -gt 1 ] && return 1
 
@@ -36,7 +33,7 @@ platform_check_image() {
 }
 
 platform_pre_upgrade() {
-       local board=$(apm821xx_board_name)
+       local board=$(board_name)
 
        case "$board" in
        mr24|\
@@ -54,7 +51,7 @@ platform_pre_upgrade() {
 }
 
 platform_do_upgrade() {
-       local board=$(apm821xx_board_name)
+       local board=$(board_name)
 
        case "$board" in
        mbl)
@@ -68,7 +65,7 @@ platform_do_upgrade() {
 }
 
 platform_copy_config() {
-       local board=$(apm821xx_board_name)
+       local board=$(board_name)
 
        case "$board" in
        mbl)
index e5afd50..8eaa892 100755 (executable)
@@ -4,11 +4,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/ar71xx.sh
 
 board_config_update
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$board" in
 a40)
index 7f20128..b2126c0 100755 (executable)
@@ -5,7 +5,6 @@
 
 . /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
-. /lib/ar71xx.sh
 
 ar71xx_setup_interfaces()
 {
@@ -545,7 +544,7 @@ ar71xx_setup_macs()
 }
 
 board_config_update
-board=$(ar71xx_board_name)
+board=$(board_name)
 ar71xx_setup_interfaces $board
 ar71xx_setup_macs $board
 board_config_flush
index 2b18741..add7e47 100755 (executable)
@@ -4,11 +4,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/ar71xx.sh
 
 board_config_update
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$board" in
 nanostation-m)
index 50b893f..1dc4862 100644 (file)
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (C) 2009-2013 OpenWrt.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/ar71xx.sh
 
 get_status_led() {
-       local board=$(ar71xx_board_name)
+       local board=$(board_name)
 
        case $board in
        a40)
@@ -175,7 +175,7 @@ get_status_led() {
                status_led="$board:blue:status"
                ;;
        eap120)
-               status_led="$(ar71xx_board_name):green:system"
+               status_led="$board:green:system"
                ;;
        eap300v2)
                status_led="engenius:blue:power"
@@ -516,7 +516,7 @@ set_state() {
                ;;
        done)
                status_led_on
-               case $(ar71xx_board_name) in
+               case $(board_name) in
                gl-ar300m)
                        fw_printenv lc >/dev/null 2>&1 && fw_setenv "bootcount" 0
                        ;;
index b4d7817..f9520b3 100644 (file)
@@ -2,7 +2,6 @@
 
 [ -e /lib/firmware/$FIRMWARE ] && exit 0
 
-. /lib/ar71xx.sh
 . /lib/functions.sh
 . /lib/functions/system.sh
 
@@ -66,7 +65,7 @@ ath9k_patch_firmware_mac() {
        macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=2 count=6
 }
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$FIRMWARE" in
 "soc_wmac.eeprom")
index a2e98f4..6a50e0c 100644 (file)
@@ -38,11 +38,10 @@ ath10kcal_patch_mac() {
 
 [ -e /lib/firmware/$FIRMWARE ] && exit 0
 
-. /lib/ar71xx.sh
 . /lib/functions.sh
 . /lib/functions/system.sh
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$FIRMWARE" in
 "ath10k/cal-pci-0000:00:00.0.bin")
index 7d2eca5..77c835f 100644 (file)
@@ -6,10 +6,10 @@ PHYNBR=${DEVPATH##*/phy}
 
 [ -n $PHYNBR ] || exit 0
 
-. /lib/ar71xx.sh
+. /lib/functions.sh
 . /lib/functions/system.sh
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$board" in
        archer-c58-v1)
index 8c57ddc..c41d4b0 100644 (file)
@@ -37,9 +37,9 @@ ar922x_disable_gpio_jtag() {
 }
 
 [ $phyname -a $ACTION = "add" ] && {
-       . /lib/ar71xx.sh
+       . /lib/functions.sh
 
-       case $(ar71xx_board_name) in
+       case $(board_name) in
        wzr-hp-ag300h)
                ar922x_disable_gpio_jtag $phyname
                ;;
index a99a4ec..338a222 100644 (file)
@@ -5,6 +5,8 @@
 
 SWITCH_NAME_CHANGED=
 
+. /lib/functions.sh
+
 do_change_switch_name() {
        local config="$1"
        local option=$2
@@ -25,8 +27,6 @@ migrate_switch_name() {
        local oldname=$1
        local newname=$2
 
-       . /lib/functions.sh
-
        config_load network
 
        logger -t migrate-switchX "Updating switch names in network configuration"
@@ -40,9 +40,7 @@ migrate_switch_name() {
        }
 }
 
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$board" in
 dir-825-c1|\
index 16722d1..d6f7077 100644 (file)
@@ -41,9 +41,7 @@ migrate_leds()
        config_foreach do_led_update_sysfs led "$@"
 }
 
-. /lib/ar71xx.sh
-
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$board" in
 dhp-1565-a1|\
index 057afe0..2d1afb1 100644 (file)
@@ -3,9 +3,9 @@
 # Copyright (C) 2010 OpenWrt.org
 #
 
-. /lib/ar71xx.sh
+. /lib/functions.sh
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 fixtrx() {
        mtd -o 32 fixtrx firmware
index ebe9c1c..b3857ef 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /lib/ar71xx.sh
+. /lib/functions.sh
 
 fix_seama_header() {
        local kernel_size=$(sed -n 's/mtd[0-9]*: \([0-9a-f]*\).*"kernel".*/\1/p' /proc/mtd)
@@ -8,7 +8,7 @@ fix_seama_header() {
        [ "$kernel_size" ] && mtd -c 0x$kernel_size fixseama firmware
 }
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$board" in
 dir-869-a1)
index 277287d..df653f2 100644 (file)
@@ -2,8 +2,6 @@
 # Copyright (C) 2009 OpenWrt.org
 #
 
-. /lib/ar71xx.sh
-
 fetch_mac_from_mtd() {
        local mtd_part=$1
        local lan_env=$2
@@ -21,7 +19,9 @@ fetch_mac_from_mtd() {
 }
 
 preinit_set_mac_address() {
-       case $(ar71xx_board_name) in
+       . /lib/functions.sh
+
+       case $(board_name) in
                c-55|\
                c-60)
                        mac_lan=$(mtd_get_mac_binary art 0)
index d677599..3a98cdc 100644 (file)
@@ -4,10 +4,10 @@
 # Copyright (C) 2009 OpenWrt.org
 #
 
-. /lib/ar71xx.sh
-
 set_preinit_iface() {
-       case $(ar71xx_board_name) in
+       . /lib/functions.sh
+
+       case $(board_name) in
        alfa-ap96 |\
        alfa-nx |\
        ap135-020 |\
index b6af921..c9aa4b1 100644 (file)
@@ -1,8 +1,7 @@
 #!/bin/sh
 
+. /lib/functions.sh
 . /lib/functions/system.sh
-. /lib/ar71xx.sh
-
 
 do_patch_ath10k_firmware() {
        local firmware_file="/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin"
@@ -25,7 +24,7 @@ do_patch_ath10k_firmware() {
        # some boards have bogus mac in otp (= directly in the PCIe card's EEPROM).
        # we have to patch the default mac in the firmware because we cannot change
        # the otp.
-       case $(ar71xx_board_name) in
+       case $(board_name) in
                dgl-5500-a1 | tew-823dru)
                        local mac
                        mac=$(mtd_get_mac_ascii nvram wlan1_mac)
@@ -44,7 +43,7 @@ do_patch_ath10k_firmware() {
 }
 
 check_patch_ath10k_firmware() {
-       case $(ar71xx_board_name) in
+       case $(board_name) in
                dgl-5500-a1 | tew-823dru)
                        do_patch_ath10k_firmware
                ;;
index ba65a79..949cb6a 100755 (executable)
@@ -184,7 +184,7 @@ alfa_check_image() {
 }
 
 platform_nand_board_name() {
-       local board=$(ar71xx_board_name)
+       local board=$(board_name)
 
        case "$board" in
        rb*) echo "routerboard";;
@@ -193,7 +193,7 @@ platform_nand_board_name() {
 }
 
 platform_check_image() {
-       local board=$(ar71xx_board_name)
+       local board=$(board_name)
        local magic="$(get_magic_word "$1")"
        local magic_long="$(get_magic_long "$1")"
 
@@ -668,7 +668,7 @@ platform_check_image() {
 }
 
 platform_pre_upgrade() {
-       local board=$(ar71xx_board_name)
+       local board=$(board_name)
 
        case "$board" in
        c-60|\
@@ -727,7 +727,7 @@ platform_pre_upgrade() {
 }
 
 platform_nand_pre_upgrade() {
-       local board=$(ar71xx_board_name)
+       local board=$(board_name)
 
        case "$board" in
        rb*)
@@ -742,7 +742,7 @@ platform_nand_pre_upgrade() {
 }
 
 platform_do_upgrade() {
-       local board=$(ar71xx_board_name)
+       local board=$(board_name)
 
        case "$board" in
        all0258n)
index dabc539..3f53293 100755 (executable)
@@ -3,12 +3,11 @@
 # Copyright (C) 2015 OpenWrt.org
 #
 
-. /lib/arc.sh
 . /lib/functions/uci-defaults.sh
 
 board_config_update
 
-case "$( arc_board_name )" in
+case "$(board_name)" in
 "arc-sdp"*)
        ucidef_set_interface_lan "eth0" "dhcp"
        ;;
index da86ee0..d8bdd50 100755 (executable)
@@ -3,12 +3,11 @@
 # Copyright (C) 2016 OpenWrt.org
 #
 
-. /lib/arc.sh
 . /lib/functions/uci-defaults.sh
 
 board_config_update
 
-case "$( arc_board_name )" in
+case "$(board_name)" in
 "arc-sdp"*)
        ucidef_set_interface_lan "eth0" "dhcp"
        ;;
index 52709f6..66f9d88 100755 (executable)
@@ -4,11 +4,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/at91.sh
 
 board_config_update
 
-case "$(at91_board_name)" in
+case "$(board_name)" in
 
 sama5d3_xplained)
        ucidef_set_interfaces_lan_wan "eth0" "eth1"
index 1f778c7..1a33e3a 100644 (file)
@@ -8,10 +8,6 @@ get_magic_long_at() {
        dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%02x"'
 }
 
-platform_machine() {
-       cat /proc/device-tree/compatible | tr '\0' '\t' | cut -f 1
-}
-
 platform_flash_type() {
        # On NAND devices "rootfs" is UBI volume, so won't be find in /proc/mtd
        grep -q "\"rootfs\"" /proc/mtd && {
@@ -23,7 +19,7 @@ platform_flash_type() {
 }
 
 platform_expected_image() {
-       local machine=$(platform_machine)
+       local machine=$(board_name)
 
        case "$machine" in
                "dlink,dir-885l")       echo "seama wrgac42_dlink.2015_dir885l"; return;;
index 9486a6a..29bcf33 100755 (executable)
@@ -3,13 +3,12 @@
 # Copyright (C) 2017 LEDE project
 
 . /lib/functions/uci-defaults.sh
-. /lib/brcm2708.sh
 . /lib/functions.sh
 . /lib/functions/system.sh
 
 board_config_update
 
-board=$(brcm2708_board_name)
+board=$(board_name)
 
 case "$board" in
 rpi-2-b |\
index 36c5cd7..6f5810e 100644 (file)
@@ -2,11 +2,11 @@
 # Copyright (C) 2015-2016 OpenWrt.org
 # Copyright (C) 2017 LEDE project
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/brcm2708.sh
 
 set_state() {
-       case "$(brcm2708_board_name)" in
+       case "$(board_name)" in
        rpi-2-b |\
        rpi-b-plus)
                status_led="led1"
index 4401c87..95497cc 100644 (file)
@@ -2,10 +2,10 @@
 # Copyright (C) 2015-2016 OpenWrt.org
 # Copyright (C) 2017 LEDE project
 
-. /lib/brcm2708.sh
-
 set_preinit_iface() {
-       case "$(brcm2708_board_name)" in
+       . /lib/functions.sh
+
+       case "$(board_name)" in
        rpi-2-b |\
        rpi-3-b |\
        rpi-b |\
index cf05a84..dfd4e97 100644 (file)
@@ -6,12 +6,8 @@ get_magic_long_at() {
        dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
 }
 
-platform_machine() {
-       grep "machine" /proc/cpuinfo | sed "s/.*:[ \t]*//"
-}
-
 platform_expected_image() {
-       local machine=$(platform_machine)
+       local machine=$(board_name)
 
        case "$machine" in
                "Netgear WGR614 V8")    echo "chk U12H072T00_NETGEAR"; return;;
index 7651650..a909673 100755 (executable)
@@ -4,11 +4,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/brcm63xx.sh
 
 board_config_update
 
-case "$(brcm63xx_board_name)" in
+case "$(board_name)" in
 a4001n1)
        ucidef_set_led_netdev "lan" "LAN" "A4001N1:green:eth" "eth0"
        ucidef_set_led_usbdev "usb" "USB" "A4001N1:green:3g" "1-1"
index 6a20fce..9d9f95d 100755 (executable)
@@ -4,11 +4,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/brcm63xx.sh
 
 board_config_update
 
-case "$(brcm63xx_board_name)" in
+case "$(board_name)" in
 
 cvg834g |\
 evg2000 |\
index b90b590..24939a9 100644 (file)
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (C) 2007-2013 OpenWrt.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/brcm63xx.sh
 
 set_state() {
-       case "$(brcm63xx_board_name)" in
+       case "$(board_name)" in
        a4001n1)
                status_led="A4001N1:green:power"
                ;;
index 21c510f..fe31ed3 100644 (file)
@@ -12,8 +12,6 @@ rt2x00_eeprom_extract() {
        local count=$3
        local mtd
 
-       . /lib/functions.sh
-
        mtd=$(find_mtd_part $part)
        [ -n "$mtd" ] || \
                rt2x00_eeprom_die "no mtd device found for partition $part"
@@ -24,9 +22,9 @@ rt2x00_eeprom_extract() {
 
 [ -e /lib/firmware/$FIRMWARE ] && exit 0
 
-. /lib/brcm63xx.sh
+. /lib/functions.sh
 
-board=$(brcm63xx_board_name)
+board=$(board_name)
 
 case "$FIRMWARE" in
 "rt2x00.eeprom" )
index 57bf6e2..94c4223 100644 (file)
@@ -4,13 +4,13 @@
 #
 #
 
-. /lib/brcm63xx.sh
+. /lib/functions.sh
 
 do_fixcrc() {
        mtd fixtrx linux
 }
 
-case "$(brcm63xx_board_name)" in
+case "$(board_name)" in
        a4001n |\
        a4001n1 |\
        ar-5381u |\
index fbe3eea..3f269df 100755 (executable)
@@ -4,9 +4,8 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/imx6.sh
 
-board=$(imx6_board_name)
+board=$(board_name)
 
 board_config_update
 
index 0bbf110..a9ca5ee 100755 (executable)
@@ -2,10 +2,8 @@
 # Copyright (C) 2010-2015 OpenWrt.org
 #
 
-. /lib/imx6.sh
-
 platform_check_image() {
-       local board=$(imx6_board_name)
+       local board=$(board_name)
 
        case "$board" in
        *gw5*)
@@ -19,7 +17,7 @@ platform_check_image() {
 }
 
 platform_pre_upgrade() {
-       local board=$(imx6_board_name)
+       local board=$(board_name)
 
        case "$board" in
        *gw5*)
index 1371767..5e04ee7 100755 (executable)
@@ -4,11 +4,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/ipq806x.sh
 
 board_config_update
 
-board=$(ipq806x_board_name)
+board=$(board_name)
 
 case "$board" in
 c2600)
index bd81a1e..28e42dc 100755 (executable)
@@ -5,12 +5,11 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/ipq806x.sh
 . /lib/functions/system.sh
 
 board_config_update
 
-board=$(ipq806x_board_name)
+board=$(board_name)
 
 case "$board" in
 ap148 |\
index 40e1330..39757eb 100644 (file)
@@ -38,11 +38,10 @@ ath10kcal_patch_mac() {
 
 [ -e /lib/firmware/$FIRMWARE ] && exit 0
 
-. /lib/ipq806x.sh
 . /lib/functions.sh
 . /lib/functions/system.sh
 
-board=$(ipq806x_board_name)
+board=$(board_name)
 
 
 case "$FIRMWARE" in
index 2ea408d..fee56cd 100644 (file)
@@ -6,10 +6,10 @@ PHYNBR=${DEVPATH##*/phy}
 
 [ -n $PHYNBR ] || exit 0
 
-. /lib/ipq806x.sh
+. /lib/functions.sh
 . /lib/functions/system.sh
 
-board=$(ipq806x_board_name)
+board=$(board_name)
 
 case "$board" in
        c2600)
index b9ea004..4d94f1f 100755 (executable)
@@ -4,9 +4,8 @@
 START=97
 boot() {
 . /lib/functions.sh
-. /lib/ipq806x.sh
 
-case $(ipq806x_board_name) in
+case $(board_name) in
        ea8500)
                # make sure auto_recovery in uboot is always on
                AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`"
index 246361b..7d8b178 100644 (file)
@@ -1,5 +1,3 @@
-. /lib/ipq806x.sh
-
 PART_NAME=firmware
 REQUIRE_IMAGE_METADATA=1
 
@@ -11,9 +9,7 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-       local board=$(ipq806x_board_name)
-
-       case "$board" in
+       case "$(board_name)" in
        ap148 |\
        ap-dk04.1-c1 |\
        d7800 |\
@@ -43,9 +39,7 @@ platform_do_upgrade() {
 }
 
 platform_nand_pre_upgrade() {
-       local board=$(ipq806x_board_name)
-
-       case "$board" in
+       case "$(board_name)" in
        nbg6817)
                zyxel_do_upgrade "$1"
                ;;
index 508a167..e1e43cf 100644 (file)
@@ -1,7 +1,3 @@
-. /lib/ixp4xx.sh
-
-RAMFS_COPY_DATA="/lib/ixp4xx.sh"
-
 CI_BLKSZ=65536
 CI_LDADR=0x00800000
 
@@ -86,7 +82,7 @@ platform_do_upgrade_combined() {
 }
 
 platform_check_image() {
-       local board=$(ixp4xx_board_name)
+       local board=$(board_name)
        local magic="$(get_magic_word "$1")"
        local partitions=$(platform_find_partitions)
        local kernelpart=$(platform_find_kernelpart "${partitions#*:}")
@@ -127,7 +123,7 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-       local board=$(ixp4xx_board_name)
+       local board=$(board_name)
 
        v "board=$board"
        case "$board" in
index 0608440..0d89759 100755 (executable)
@@ -4,11 +4,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/kirkwood.sh
 
 board_config_update
 
-board=$(kirkwood_board_name)
+board=$(board_name)
 
 case "$board" in
 "dockstar")
index 19f0292..85049d2 100755 (executable)
@@ -5,11 +5,10 @@
 
 . /lib/functions/uci-defaults.sh
 . /lib/functions/system.sh
-. /lib/kirkwood.sh
 
 board_config_update
 
-board=$(kirkwood_board_name)
+board=$(board_name)
 
 case "$board" in
 "dockstar"|\
index 6465085..71a1639 100755 (executable)
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (C) 2014 OpenWrt.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/kirkwood.sh
 
 get_status_led() {
-       case $(kirkwood_board_name) in
+       case $(board_name) in
        dockstar|\
        goflexhome|\
        goflexnet)
index 3f1b762..ba7e4bb 100755 (executable)
@@ -4,9 +4,8 @@
 START=97
 boot() {
 . /lib/functions.sh
-. /lib/kirkwood.sh
 
-case $(kirkwood_board_name) in
+case $(board_name) in
        linksys-audi|linksys-viper)
                # make sure auto_recovery in uboot is always on
                AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`"
index 32e863e..4073c2d 100755 (executable)
@@ -3,14 +3,13 @@
 START=98
 boot() {
 . /lib/functions.sh
-. /lib/kirkwood.sh
 
 #configuring lm85 onboard temp/fan controller to run the fan on its own
 #for more information, please read https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
 
 path_to_hwmon='/sys/devices/platform/ocp@f1000000/f1011000.i2c/i2c-0/0-002e/hwmon/hwmon0'
 
-case $(kirkwood_board_name) in
+case $(board_name) in
        nsa310b)
        echo 2 > "$path_to_hwmon/pwm1_enable" # fan is on pwm1
        echo 1 > "$path_to_hwmon/pwm1_auto_channels" # temp1 is the only one that changes
index f75acb0..b28ee87 100644 (file)
@@ -1,11 +1,9 @@
-. /lib/kirkwood.sh
-
 RAMFS_COPY_BIN='fw_printenv fw_setenv'
 RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
 
 platform_check_image() {
        [ "$#" -gt 1 ] && return 1
-       local board="$(kirkwood_board_name)"
+       local board="$(board_name)"
        local magic="$(get_magic_long "$1")"
 
        case "$board" in
@@ -28,7 +26,7 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-       local board="$(kirkwood_board_name)"
+       local board="$(board_name)"
 
        case "$board" in
        "linksys-audi"|\
index efcf809..65d738f 100755 (executable)
@@ -4,11 +4,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/mcs814x.sh
 
 board_config_update
 
-board=$(mcs814x_board_name)
+board=$(board_name)
 
 case "$board" in
 dlan-usb-extender)
index e0a0861..511b56b 100755 (executable)
@@ -2,13 +2,12 @@
 # Copyright (C) 2014-2015 OpenWrt.org
 
 . /lib/functions/uci-defaults.sh
-. /lib/mpc85xx.sh
 . /lib/functions.sh
 . /lib/functions/system.sh
 
 board_config_update
 
-board=$(mpc85xx_board_name)
+board=$(board_name)
 
 case "$board" in
 tl-wdr4900-v1)
index 1107763..b269427 100644 (file)
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (C) 2013 OpenWrt.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/mpc85xx.sh
 
 get_status_led() {
-        case $(mpc85xx_board_name) in
+        case $(board_name) in
         tl-wdr4900-v1)
                 status_led="tp-link:blue:system"
                 ;;
index 0baec28..4b5b7a3 100644 (file)
@@ -13,9 +13,6 @@ ath9k_eeprom_extract() {
        local count=$3
        local mtd
 
-       . /lib/functions.sh
-       . /lib/functions/system.sh
-
        mtd=$(find_mtd_chardev $part)
        [ -n "$mtd" ] || \
                ath9k_eeprom_die "no mtd device found for partition $part"
@@ -29,9 +26,6 @@ tpl_set_wireless_mac()
        local offset=$1
        local mac
 
-       . /lib/functions.sh
-       . /lib/functions/system.sh
-
        mac=$(mtd_get_mac_binary u-boot 326656)
        mac=$(macaddr_add $mac $offset)
 
@@ -40,9 +34,10 @@ tpl_set_wireless_mac()
 
 [ -e $FW_FILE ] && exit 0
 
-. /lib/mpc85xx.sh
+. /lib/functions.sh
+. /lib/functions/system.sh
 
-board=$(mpc85xx_board_name)
+board=$(board_name)
 
 case "$FIRMWARE" in
 "pci_wmac0.eeprom")
index d95ec30..65b3674 100755 (executable)
@@ -2,10 +2,7 @@
 # Copyright (C) 2011 OpenWrt.org
 #
 
-. /lib/mpc85xx.sh
-
 PART_NAME=firmware
-RAMFS_COPY_DATA=/lib/mpc85xx.sh
 
 tplink_get_hwid() {
        local part
@@ -25,7 +22,7 @@ tplink_get_image_boot_size() {
 }
 
 platform_check_image() {
-       local board=$(mpc85xx_board_name)
+       local board=$(board_name)
        local magic="$(get_magic_long "$1")"
 
        [ "$#" -gt 1 ] && return 1
@@ -65,7 +62,7 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-       local board=$(mpc85xx_board_name)
+       local board=$(board_name)
 
        case "$board" in
        *)
index f4b7228..8451990 100755 (executable)
@@ -5,11 +5,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/mvebu.sh
 
 board_config_update
 
-board=$(mvebu_board_name)
+board=$(board_name)
 
 case "$board" in
 armada-385-linksys-caiman)
index 94ce7d7..86a1782 100755 (executable)
@@ -5,11 +5,10 @@
 #
 
 . /lib/functions/uci-defaults.sh
-. /lib/mvebu.sh
 
 board_config_update
 
-board=$(mvebu_board_name)
+board=$(board_name)
 
 case "$board" in
 armada-385-linksys-caiman|\
index 622c7d9..4a3f54e 100644 (file)
@@ -2,11 +2,11 @@
 # Copyright (C) 2014-2016 OpenWrt.org
 # Copyright (C) 2016 LEDE-Project.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/mvebu.sh
 
 get_status_led() {
-       case $(mvebu_board_name) in
+       case $(board_name) in
        armada-385-linksys-caiman)
                status_led="caiman:white:power"
                ;;
index 8eeb5f9..c1532ac 100755 (executable)
@@ -5,9 +5,8 @@
 START=97
 boot() {
 . /lib/functions.sh
-. /lib/mvebu.sh
 
-case $(mvebu_board_name) in
+case $(board_name) in
        armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
                # make sure auto_recovery in uboot is always on
                AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`"
index b20d9fd..baf4a20 100644 (file)
@@ -5,10 +5,10 @@
 
 [ ! -e /etc/config/wireless ] && exit 0
 
+. /lib/functions.sh
 . /lib/functions/system.sh
-. /lib/mvebu.sh
 
-board=$(mvebu_board_name)
+board=$(board_name)
 
 case "$board" in
 armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba)
index 2ebb337..e15ce61 100644 (file)
@@ -3,9 +3,9 @@
 # Copyright (C) 2017 LEDE-Project.org
 #
 
-. /lib/mvebu.sh
+. /lib/functions.sh
 
-board=$(mvebu_board_name)
+board=$(board_name)
 
 case "$board" in
 armada-xp-linksys-mamba)
index ae34ef4..e884351 100644 (file)
@@ -7,9 +7,8 @@ preinit_set_mac_address() {
        local mac
 
        . /lib/functions.sh
-       . /lib/mvebu.sh
 
-       case $(mvebu_board_name) in
+       case $(board_name) in
        armada-xp-linksys-mamba)
                mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
                ifconfig eth0 hw ether $mac 2>/dev/null
index 3edd82e..c55c1f5 100644 (file)
@@ -6,9 +6,8 @@
 preinit_mount_syscfg() {
 
        . /lib/functions.sh
-       . /lib/mvebu.sh
 
-       case $(mvebu_board_name) in
+       case $(board_name) in
        armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
                needs_recovery=0
                syscfg_part=$(grep syscfg /proc/mtd |cut -c4)
index dd21c09..89d884f 100755 (executable)
@@ -3,10 +3,8 @@
 # Copyright (C) 2016 LEDE-Project.org
 #
 
-. /lib/mvebu.sh
-
 RAMFS_COPY_BIN='fw_printenv fw_setenv'
-RAMFS_COPY_DATA='/lib/mvebu.sh /etc/fw_env.config /var/lock/fw_printenv.lock'
+RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
 REQUIRE_IMAGE_METADATA=1
 
 platform_check_image() {
@@ -14,9 +12,7 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-       local board=$(mvebu_board_name)
-
-       case "$board" in
+       case "$(board_name)" in
        armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
                platform_do_upgrade_linksys "$ARGV"
                ;;
@@ -32,9 +28,7 @@ platform_do_upgrade() {
        esac
 }
 platform_copy_config() {
-       local board=$(mvebu_board_name)
-
-       case "$board" in
+       case "$(board_name)" in
        armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-rango|armada-385-linksys-shelby|armada-xp-linksys-mamba)
                platform_copy_config_linksys
                ;;
index b31deb7..95f6534 100755 (executable)
@@ -2,11 +2,10 @@
 # Copyright (C) 2013-2015 OpenWrt.org
 
 . /lib/functions/uci-defaults.sh
-. /lib/mxs.sh
 
 board_config_update
 
-board=$(mxs_board_name)
+board=$(board_name)
 
 case "$board" in
 *)
index 11b1f75..3b05f6d 100644 (file)
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (C) 2013-2014 OpenWrt.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/mxs.sh
 
 get_status_led() {
-       case $(mxs_board_name) in
+       case $(board_name) in
        duckbill)
                status_led="duckbill:green:status"
                ;;
index b4b598c..5d66509 100755 (executable)
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 . /lib/functions/uci-defaults.sh
-. /lib/oxnas.sh
 
-board=$(oxnas_board_name)
+board=$(board_name)
 board_config_update
 
 case $board in
index ac7fa0a..7ecaed5 100755 (executable)
@@ -8,7 +8,7 @@ board_config_update
 
 lan_mac=""
 
-case "$(oxnas_board_name)" in
+case "$(board_name)" in
        kd20)
                lan_mac="$(legacy_boot_mac_adr)"
                ;;
index 51771f3..fd3bc3b 100644 (file)
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (C) 2009-2013 OpenWrt.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/oxnas.sh
 
 get_status_led() {
-       case $(oxnas_board_name) in
+       case $(board_name) in
        akitio)
                status_led="akitio:red:status"
                ;;
index 48c1dc3..6652e14 100644 (file)
@@ -2,13 +2,10 @@
 # Copyright (C) 2014 OpenWrt.org
 #
 
-. /lib/oxnas.sh
-
-RAMFS_COPY_DATA=/lib/oxnas.sh
 REQUIRE_IMAGE_METADATA=1
 
 platform_check_image() {
-       local board=$(oxnas_board_name)
+       local board=$(board_name)
 
        [ "$ARGC" -gt 1 ] && return 1
 
index b20b83c..222a25a 100644 (file)
@@ -2,13 +2,10 @@
 # Copyright (C) 2010 OpenWrt.org
 #
 
-. /lib/ppc40x.sh
-
 PART_NAME=firmware
-RAMFS_COPY_DATA=/lib/ppc40x.sh
 
 platform_check_image() {
-       local board=$(ppc40x_board_name)
+       local board=$(board_name)
        local magic="$(get_magic_word "$1")"
 
        [ "$#" -gt 1 ] && return 1
@@ -28,7 +25,7 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-       local board=$(ppc40x_board_name)
+       local board=$(board_name)
 
        case "$board" in
        *)
index 61fbf0f..83141de 100755 (executable)
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 . /lib/functions/uci-defaults.sh
-. /lib/ramips.sh
 
 set_usb_led() {
        ucidef_set_led_usbdev "usb" "USB" "${1}" "${2:-1-1}"
@@ -12,7 +11,7 @@ set_wifi_led() {
 }
 
 
-board=$(ramips_board_name)
+board=$(board_name)
 
 board_config_update
 
index f6129b5..78ba103 100755 (executable)
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 . /lib/functions.sh
-. /lib/ramips.sh
 . /lib/functions/uci-defaults.sh
 . /lib/functions/system.sh
 
@@ -494,7 +493,7 @@ ramips_setup_macs()
 }
 
 board_config_update
-board=$(ramips_board_name)
+board=$(board_name)
 ramips_setup_interfaces $board
 ramips_setup_macs $board
 board_config_flush
index 859dfb3..a847a64 100755 (executable)
@@ -1,11 +1,10 @@
 #!/bin/sh
 
 . /lib/functions/uci-defaults.sh
-. /lib/ramips.sh
 
 board_config_update
 
-board=$(ramips_board_name)
+board=$(board_name)
 
 case "$board" in
 ubnt-erx)
index 0f4e646..531c8e0 100644 (file)
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Copyright (C) 2010-2013 OpenWrt.org
 
+. /lib/functions.sh
 . /lib/functions/leds.sh
-. /lib/ramips.sh
 
 get_status_led() {
-       board=$(ramips_board_name)
+       board=$(board_name)
 
        case $board in
        3g150b|\
index b44bae9..1e25643 100644 (file)
@@ -11,8 +11,6 @@ rt2x00_eeprom_extract() {
        local count=$3
        local mtd
 
-       . /lib/functions.sh
-
        mtd=$(find_mtd_part $part)
        [ -n "$mtd" ] || \
                rt2x00_eeprom_die "no mtd device found for partition $part"
@@ -35,10 +33,10 @@ rt2x00_eeprom_set_macaddr() {
 FW="/lib/firmware/$FIRMWARE"
 [ -e "$FW" ] && exit 0
 
-. /lib/ramips.sh
+. /lib/functions.sh
 . /lib/functions/system.sh
 
-board=$(ramips_board_name)
+board=$(board_name)
 
 case "$FIRMWARE" in
 "soc_wmac.eeprom")
index a9fdd66..0f260fa 100755 (executable)
@@ -3,9 +3,9 @@
 START=99
 
 start() {
-       . /lib/ramips.sh
+       . /lib/functions.sh
 
-       local board=$(ramips_board_name)
+       local board=$(board_name)
        if [ $board = "sk-wb8" ]; then
                fw_setenv bootcount 0
        fi
index f8d408d..9533aed 100644 (file)
@@ -3,7 +3,7 @@
 # Copyright (C) 2012 OpenWrt.org
 #
 
-. /lib/ramips.sh
+. /lib/functions.sh
 
 fix_seama_header() {
        local kernel_size=$(sed -n 's/mtd[0-9]*: \([0-9a-f]*\).*"kernel".*/\1/p' /proc/mtd)
@@ -11,7 +11,7 @@ fix_seama_header() {
        [ "$kernel_size" ] && mtd -c 0x$kernel_size fixseama firmware
 }
 
-board=$(ramips_board_name)
+board=$(board_name)
 
 case "$board" in
 cy-swr1100 | \
index 057fe45..007abf7 100644 (file)
@@ -6,9 +6,9 @@
 # that happens, so this needs to run very early during boot.
 
 do_checksumming_disable() {
-       . /lib/ramips.sh
+       . /lib/functions.sh
 
-       local board=$(ramips_board_name)
+       local board=$(board_name)
 
        case "$board" in
        wnce2001)
index 9b5da57..e0a2602 100755 (executable)
@@ -2,13 +2,10 @@
 # Copyright (C) 2010 OpenWrt.org
 #
 
-. /lib/ramips.sh
-
 PART_NAME=firmware
-RAMFS_COPY_DATA=/lib/ramips.sh
 
 platform_check_image() {
-       local board=$(ramips_board_name)
+       local board=$(board_name)
        local magic="$(get_magic_long "$1")"
 
        [ "$#" -gt 1 ] && return 1
@@ -275,7 +272,7 @@ platform_check_image() {
 }
 
 platform_nand_pre_upgrade() {
-       local board=$(ramips_board_name)
+       local board=$(board_name)
 
        case "$board" in
        ubnt-erx|\
@@ -286,7 +283,7 @@ platform_nand_pre_upgrade() {
 }
 
 platform_do_upgrade() {
-       local board=$(ramips_board_name)
+       local board=$(board_name)
 
        case "$board" in
        hc5962|\
index 900fb7d..98264c0 100755 (executable)
@@ -1,14 +1,13 @@
 #!/bin/sh
 . /lib/functions.sh
 . /lib/functions/system.sh
-. /lib/ramips.sh
 
 partname=""
 offset=""
 NEW_MAC=
 YES=
 
-board=$(ramips_board_name)
+board=$(board_name)
 case $board in
        witi)
                partname=factory
index 2b18748..782f3ec 100755 (executable)
@@ -3,12 +3,11 @@
 # Copyright (C) 2013-2015 OpenWrt.org
 #
 
-. /lib/sunxi.sh
 . /lib/functions/uci-defaults.sh
 
 board_config_update
 
-case "$( sunxi_board_name )" in
+case "$(board_name)" in
 "olimex,a20-olinuxino-micro")
        ucidef_set_interface_lan 'wlan0'
        ;;
index 7f508ff..170cfd5 100644 (file)
@@ -1,9 +1,10 @@
 #!/bin/sh
-. /lib/sunxi.sh
 
 do_b53_hack() {
+       . /lib/functions.sh
+
        # hack: enable switch on Lamobo R1 and reset counters
-       case "$( sunxi_board_name )" in
+       case "$(board_name)" in
        "lamobo,lamobo-r1")
                ifconfig eth0 up
                sleep 1