From e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sun, 9 Jul 2017 13:00:36 +0200 Subject: treewide: use only board_name function to get name Do not parse /tmp/sysinfo/board_name, /proc/cpuinfo or the device tree compatible string directly. Always use the board_name function to get the board name. The admswconfig package still reads /proc/cpuinfo directly. The code looks somehow broken and the whole adm5120 which uses this package looks unmaintained. Leave it as it is for now. Signed-off-by: Mathias Kresin --- target/linux/octeon/base-files/lib/upgrade/platform.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'target/linux/octeon/base-files/lib/upgrade') diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh index 91763ce1c6..cd49c0da36 100755 --- a/target/linux/octeon/base-files/lib/upgrade/platform.sh +++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh @@ -22,9 +22,7 @@ platform_get_rootfs() { } platform_copy_config() { - local board="$(cat /tmp/sysinfo/board_name)" - - case "$board" in + case "$(board_name)" in erlite) mount -t vfat /dev/sda1 /mnt cp -af "$CONF_TAR" /mnt/ @@ -58,7 +56,7 @@ platform_do_flash() { platform_do_upgrade() { local tar_file="$1" - local board=$(cat /tmp/sysinfo/board_name) + local board=$(board_name) local rootfs="$(platform_get_rootfs)" local kernel= @@ -81,7 +79,7 @@ platform_do_upgrade() { } platform_check_image() { - local board=$(cat /tmp/sysinfo/board_name) + local board=$(board_name) case "$board" in erlite | \ -- cgit v1.2.3