lantiq: remove lantiq_board_name, use the generic function instead
authorFelix Fietkau <nbd@nbd.name>
Fri, 17 Mar 2017 15:21:30 +0000 (16:21 +0100)
committerFelix Fietkau <nbd@nbd.name>
Wed, 22 Mar 2017 10:43:21 +0000 (11:43 +0100)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/boot/uboot-envtools/files/lantiq
target/linux/lantiq/base-files/etc/board.d/01_leds
target/linux/lantiq/base-files/etc/board.d/02_network
target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
target/linux/lantiq/base-files/lib/functions/lantiq.sh
target/linux/lantiq/base-files/lib/upgrade/platform.sh

index 185f2fe..d1a6668 100644 (file)
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/functions/lantiq.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(lantiq_board_name)
+board=$(board_name)
 
 case "$board" in
 BTHOMEHUBV2B)
index 0698d6c..8de222a 100755 (executable)
@@ -32,7 +32,7 @@ led_internet="$(lantiq_get_dt_led internet)"
        ucidef_set_led_netdev "internet" "internet" "$led_internet" "$interface"
 }
 
-board=$(lantiq_board_name)
+board=$(board_name)
 
 case "$board" in
 ARV4525PW)
index 0af555f..2f744f8 100755 (executable)
@@ -18,7 +18,7 @@ lan_mac=""
 wan_mac=""
 interface_wan=""
 
-board=$(lantiq_board_name)
+board=$(board_name)
 
 case "$board" in
 ACMP252|GIGASX76X)
index 2511ed6..1c2b845 100644 (file)
@@ -5,7 +5,6 @@
 
 . /lib/functions.sh
 . /lib/functions/system.sh
-. /lib/functions/lantiq.sh
 . /lib/upgrade/nand.sh
 
 ath10k_caldata_die() {
@@ -37,7 +36,7 @@ ath10k_caldata_set_macaddr() {
 
 case "$FIRMWARE" in
 "ath10k/cal-pci-0000:02:00.0.bin")
-       board=$(lantiq_board_name)
+       board=$(board_name)
        case $board in
                BTHOMEHUBV5A)
                        ath10k_caldata_extract_ubi "caldata" 20480 2116
index 1c6b066..6b9d23a 100644 (file)
@@ -5,7 +5,6 @@
 
 . /lib/functions.sh
 . /lib/functions/system.sh
-. /lib/functions/lantiq.sh
 . /lib/upgrade/nand.sh
 
 # xor multiple hex values of the same length
@@ -114,7 +113,7 @@ case "$FIRMWARE" in
        "ath9k-eeprom-pci-0000:00:0e.0.bin" | \
        "ath9k-eeprom-pci-0000:01:00.0.bin" | \
        "ath9k-eeprom-pci-0000:02:00.0.bin")
-               board=$(lantiq_board_name)
+               board=$(board_name)
 
                case "$board" in
                        ARV7518PW)
index 89f194b..5d760d1 100644 (file)
@@ -9,15 +9,6 @@ lantiq_board_model() {
        echo "$model"
 }
 
-lantiq_board_name() {
-       local name
-
-       [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
-       [ -z "$name" ] && name="unknown"
-
-       echo "$name"
-}
-
 lantiq_get_dt_led() {
        local label
        local ledpath
index d4db8d2..9158fa7 100755 (executable)
@@ -1,5 +1,3 @@
-. /lib/functions/lantiq.sh
-
 PART_NAME=firmware
 REQUIRE_IMAGE_METADATA=1
 
@@ -8,7 +6,7 @@ platform_check_image() {
 }
 
 platform_pre_upgrade() {
-       local board=$(lantiq_board_name)
+       local board=$(board_name)
 
        case "$board" in
        BTHOMEHUBV2B|BTHOMEHUBV3A|BTHOMEHUBV5A|P2812HNUF* )