diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-05-12 22:36:07 +0200 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-07-15 23:13:34 +0200 |
| commit | f12a32630ff52b5e13397f64e9fb31708e97fb60 (patch) | |
| tree | 46db1bb2606e05b40aaf2e43e7468531fa8df7b6 /target/linux/mvebu/base-files/lib | |
| parent | ced05ca9e092817f2f4d4fe25c5c56700838a3ad (diff) | |
| download | upstream-f12a32630ff52b5e13397f64e9fb31708e97fb60.tar.gz upstream-f12a32630ff52b5e13397f64e9fb31708e97fb60.tar.bz2 upstream-f12a32630ff52b5e13397f64e9fb31708e97fb60.zip | |
treewide: use the generic board_name function
Use the generic function instead ot the target specific ones.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/mvebu/base-files/lib')
3 files changed, 5 insertions, 13 deletions
diff --git a/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac b/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac index ae34ef49da..e884351bf7 100644 --- a/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac +++ b/target/linux/mvebu/base-files/lib/preinit/06_set_iface_mac @@ -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 diff --git a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg index 3edd82ebcd..c55c1f5c5a 100644 --- a/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg +++ b/target/linux/mvebu/base-files/lib/preinit/81_linksys_syscfg @@ -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) diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index dd21c0958e..89d884f1bf 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -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 ;; |