aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-07-09 13:00:36 +0200
committerMathias Kresin <dev@kresin.me>2017-07-15 23:13:34 +0200
commite4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a (patch)
treea4534355402283a176866ce6b03f774d8cf98769 /target/linux/octeon
parente0b9ec8e969e1c37c284cfa2f252e9b0a71157db (diff)
downloadupstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.tar.gz
upstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.tar.bz2
upstream-e4e984f2a07d2cd96d8e5e90955bc268eb5d4e5a.zip
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 <dev@kresin.me>
Diffstat (limited to 'target/linux/octeon')
-rwxr-xr-xtarget/linux/octeon/base-files/etc/board.d/01_network2
-rw-r--r--target/linux/octeon/base-files/lib/preinit/79_move_config4
-rwxr-xr-xtarget/linux/octeon/base-files/lib/upgrade/platform.sh8
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/octeon/base-files/etc/board.d/01_network b/target/linux/octeon/base-files/etc/board.d/01_network
index 851b7e8f18..79e508955e 100755
--- a/target/linux/octeon/base-files/etc/board.d/01_network
+++ b/target/linux/octeon/base-files/etc/board.d/01_network
@@ -7,7 +7,7 @@
board_config_update
-case "$(cat /tmp/sysinfo/board_name)" in
+case "$(board_name)" in
erlite)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
diff --git a/target/linux/octeon/base-files/lib/preinit/79_move_config b/target/linux/octeon/base-files/lib/preinit/79_move_config
index 4ab321b690..ec63d9f5ff 100644
--- a/target/linux/octeon/base-files/lib/preinit/79_move_config
+++ b/target/linux/octeon/base-files/lib/preinit/79_move_config
@@ -2,7 +2,9 @@
# Copyright (C) 2014 OpenWrt.org
move_config() {
- case "$(cat /tmp/sysinfo/board_name)" in
+ . /lib/functions.sh
+
+ case "$(board_name)" in
erlite)
mount -t vfat /dev/sda1 /mnt
[ -f /mnt/sysupgrade.tgz ] && mv -f /mnt/sysupgrade.tgz /
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 | \