lantiq: remove lantiq_board_name, use the generic function instead

Signed-off-by: Felix Fietkau <[email protected]>

package/boot/uboot-envtools/files/lantiq

@@ -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)

target/linux/lantiq/base-files/etc/board.d/01_leds

@@ -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)

target/linux/lantiq/base-files/etc/board.d/02_network

@@ -18,7 +18,7 @@ lan_mac=""
 wan_mac=""
 interface_wan=""
 
-board=$(lantiq_board_name)
+board=$(board_name)
 
 case "$board" in
 ACMP252|GIGASX76X)

target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata

@@ -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

target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom

@@ -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)

target/linux/lantiq/base-files/lib/functions/lantiq.sh

@@ -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

target/linux/lantiq/base-files/lib/upgrade/platform.sh

@@ -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* )