From dcbbac55edbcc97e1ba320149eba886d3ab901b0 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Mon, 15 May 2017 23:59:25 +0200 Subject: [PATCH] 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 --- .../mpc85xx/base-files/etc/board.d/02_network | 4 +-- target/linux/mpc85xx/base-files/etc/diag.sh | 6 ++-- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 4 +-- .../linux/mpc85xx/base-files/lib/mpc85xx.sh | 33 ------------------- .../lib/preinit/01_preinit_do_mpc85xx.sh | 9 ----- .../lib/preinit/05_set_preinit_iface_mpc85xx | 2 -- .../base-files/lib/upgrade/platform.sh | 4 +-- 7 files changed, 9 insertions(+), 53 deletions(-) delete mode 100755 target/linux/mpc85xx/base-files/lib/mpc85xx.sh delete mode 100644 target/linux/mpc85xx/base-files/lib/preinit/01_preinit_do_mpc85xx.sh 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 1fedb7962e2..19f01a65897 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 72617951978..3d56d14b08d 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 4b5b7a30ba9..3e6488b4c76 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 ;; diff --git a/target/linux/mpc85xx/base-files/lib/mpc85xx.sh b/target/linux/mpc85xx/base-files/lib/mpc85xx.sh deleted file mode 100755 index 065589f18f0..00000000000 --- a/target/linux/mpc85xx/base-files/lib/mpc85xx.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013 OpenWrt.org -# - -MPC85XX_BOARD_NAME= -MPC85XX_MODEL= - -mpc85xx_board_detect() { - local model - local name - - model=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /model/ {print $2}' /proc/cpuinfo) - - case "$model" in - *"HiveAP-330") - name="hiveap-330" - ;; - *"TL-WDR4900 v1") - name="tl-wdr4900-v1" - ;; - esac - - [ -z "$name" ] && name="unknown" - - [ -z "$MPC85XX_BOARD_NAME" ] && MPC85XX_BOARD_NAME="$name" - [ -z "$MPC85XX_MODEL" ] && MPC85XX_MODEL="$model" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - echo "$MPC85XX_BOARD_NAME" > /tmp/sysinfo/board_name - echo "$MPC85XX_MODEL" > /tmp/sysinfo/model -} diff --git a/target/linux/mpc85xx/base-files/lib/preinit/01_preinit_do_mpc85xx.sh b/target/linux/mpc85xx/base-files/lib/preinit/01_preinit_do_mpc85xx.sh deleted file mode 100644 index 88ba608379a..00000000000 --- a/target/linux/mpc85xx/base-files/lib/preinit/01_preinit_do_mpc85xx.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -do_mpc85xx() { - . /lib/mpc85xx.sh - - mpc85xx_board_detect -} - -boot_hook_add preinit_main do_mpc85xx diff --git a/target/linux/mpc85xx/base-files/lib/preinit/05_set_preinit_iface_mpc85xx b/target/linux/mpc85xx/base-files/lib/preinit/05_set_preinit_iface_mpc85xx index 22d7471dda0..748a87490e0 100644 --- a/target/linux/mpc85xx/base-files/lib/preinit/05_set_preinit_iface_mpc85xx +++ b/target/linux/mpc85xx/base-files/lib/preinit/05_set_preinit_iface_mpc85xx @@ -3,8 +3,6 @@ # Copyright (C) 2013 OpenWrt.org # -. /lib/mpc85xx.sh - mpc85xx_set_preinit_iface() { ifname=eth0 } diff --git a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh index 9e3a3d661a7..6c1a140461a 100755 --- a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh @@ -32,7 +32,7 @@ platform_check_image() { [ "$#" -gt 1 ] && return 1 case $board in - hiveap-330) + aerohive,hiveap-330) local init_magic=$(get_magic_long_at "$1" "65536") local root_magic=$(get_magic_long_at "$1" "131072") local kernel_magic=$(get_magic_long_at "$1" "10551296") @@ -55,7 +55,7 @@ platform_check_image() { } return 0 ;; - tl-wdr4900-v1) + tplink,tl-wdr4900-v1) [ "$magic" != "01000000" ] && { echo "Invalid image type." return 1