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/ipq806x/base-files | |
| 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/ipq806x/base-files')
6 files changed, 8 insertions, 18 deletions
diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds index 1371767268..5e04ee773a 100755 --- a/target/linux/ipq806x/base-files/etc/board.d/01_leds +++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds @@ -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) diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network index bd81a1ebff..28e42dcaf8 100755 --- a/target/linux/ipq806x/base-files/etc/board.d/02_network +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network @@ -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 |\ diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 40e1330bf0..39757eb161 100644 --- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -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 diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac index 2ea408d619..fee56cd661 100644 --- a/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac +++ b/target/linux/ipq806x/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac @@ -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) diff --git a/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery b/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery index b9ea004207..4d94f1f767 100755 --- a/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery +++ b/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery @@ -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`" diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh index 246361bbf6..7d8b178339 100644 --- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh @@ -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" ;; |