From dcbbac55edbcc97e1ba320149eba886d3ab901b0 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Mon, 15 May 2017 23:59:25 +0200 Subject: mpc85xx: use the generic board detect Use the values populated by the generic board detect function. The first compatible from the device tree source file will be the board name in userspace. The model property from the device tree source file will be the model name. Change the board name where used in the userspace and drop the target specific board detect, to use the generic one. Signed-off-by: Mathias Kresin --- target/linux/mpc85xx/base-files/etc/board.d/02_network | 4 ++-- target/linux/mpc85xx/base-files/etc/diag.sh | 6 +++--- .../linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/mpc85xx/base-files/etc') diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network index 1fedb79..19f01a6 100755 --- a/target/linux/mpc85xx/base-files/etc/board.d/02_network +++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network @@ -10,10 +10,10 @@ board_config_update board=$(board_name) case "$board" in -hiveap-330) +aerohive,hiveap-330) ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; -tl-wdr4900-v1) +tplink,tl-wdr4900-v1) ucidef_add_switch "switch0" \ "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan" ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary config 332)" diff --git a/target/linux/mpc85xx/base-files/etc/diag.sh b/target/linux/mpc85xx/base-files/etc/diag.sh index 7261795..3d56d14 100644 --- a/target/linux/mpc85xx/base-files/etc/diag.sh +++ b/target/linux/mpc85xx/base-files/etc/diag.sh @@ -6,13 +6,13 @@ get_status_led() { case $(board_name) in - hiveap-330) + aerohive,hiveap-330) status_led="hiveap-330:green:tricolor0" ;; - tl-wdr4900-v1) + tplink,tl-wdr4900-v1) status_led="tp-link:blue:system" ;; -esac + esac } set_state() { diff --git a/target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 4b5b7a3..3e6488b 100644 --- a/target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -42,7 +42,7 @@ board=$(board_name) case "$FIRMWARE" in "pci_wmac0.eeprom") case $board in - tl-wdr4900-v1) + tplink,tl-wdr4900-v1) ath9k_eeprom_extract "caldata" 4096 2048 tpl_set_wireless_mac 0 ;; @@ -54,7 +54,7 @@ case "$FIRMWARE" in "pci_wmac1.eeprom") case $board in - tl-wdr4900-v1) + tplink,tl-wdr4900-v1) ath9k_eeprom_extract "caldata" 20480 2048 tpl_set_wireless_mac -1 ;; -- cgit v1.1