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 <dev@kresin.me>
master
Mathias Kresin 8 years ago
parent f0e1f69f39
commit dcbbac55ed
  1. 4
      target/linux/mpc85xx/base-files/etc/board.d/02_network
  2. 6
      target/linux/mpc85xx/base-files/etc/diag.sh
  3. 4
      target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
  4. 33
      target/linux/mpc85xx/base-files/lib/mpc85xx.sh
  5. 9
      target/linux/mpc85xx/base-files/lib/preinit/01_preinit_do_mpc85xx.sh
  6. 2
      target/linux/mpc85xx/base-files/lib/preinit/05_set_preinit_iface_mpc85xx
  7. 4
      target/linux/mpc85xx/base-files/lib/upgrade/platform.sh

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

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

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

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

@ -1,9 +0,0 @@
#!/bin/sh
do_mpc85xx() {
. /lib/mpc85xx.sh
mpc85xx_board_detect
}
boot_hook_add preinit_main do_mpc85xx

@ -3,8 +3,6 @@
# Copyright (C) 2013 OpenWrt.org
#
. /lib/mpc85xx.sh
mpc85xx_set_preinit_iface() {
ifname=eth0
}

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

Loading…
Cancel
Save