pistachio: remove pistachio_board_name, use the generic function

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/boot/uboot-envtools/files/pistachio b/package/boot/uboot-envtools/files/pistachio
index 56bac3580435f116812f6f6f94474a69b2a226c4..ac82d9da8bd8b46e12889db91bdbadcf8d672e8d 100644 (file)
--- a/package/boot/uboot-envtools/files/pistachio
+++ b/package/boot/uboot-envtools/files/pistachio
@@ -10,11 +10,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/pistachio.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(pistachio_board_name)
+board=$(board_name)
 
 case "$board" in
 marduk)

diff --git a/target/linux/pistachio/base-files/etc/diag.sh b/target/linux/pistachio/base-files/etc/diag.sh
index 7b556498d67388eb93ea68fa678b930070c7d06f..ed69d43385cef7232ba1ab359931987f6cb939d9 100755 (executable)
--- a/target/linux/pistachio/base-files/etc/diag.sh
+++ b/target/linux/pistachio/base-files/etc/diag.sh
@@ -7,7 +7,6 @@
 #
 
 . /lib/functions/leds.sh
-. /lib/pistachio.sh
 
 status_led="marduk:red:heartbeat"
 

diff --git a/target/linux/pistachio/base-files/lib/pistachio.sh b/target/linux/pistachio/base-files/lib/pistachio.sh
index f9a16db3ed80504faa2572815cf7d153e3c3e37d..9390a4c0fff4f0a3c679eb9a70f29a5f942226f2 100755 (executable)
--- a/target/linux/pistachio/base-files/lib/pistachio.sh
+++ b/target/linux/pistachio/base-files/lib/pistachio.sh
@@ -32,11 +32,3 @@ pistachio_board_detect() {
        echo "$PISTACHIO_BOARD_NAME" > /tmp/sysinfo/board_name
        echo "$PISTACHIO_MODEL" > /tmp/sysinfo/model
 }
-
-pistachio_board_name() {
-       local name
-       [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
-       [ -z "$name" ] && name="unknown"
-
-       echo "$name"
-}

diff --git a/target/linux/pistachio/base-files/lib/upgrade/platform.sh b/target/linux/pistachio/base-files/lib/upgrade/platform.sh
index 5a886fbee63d08a70d5ba0fd3ff739b106581830..2ddac783f37a26a4411429126f9e8c04a38749aa 100755 (executable)
--- a/target/linux/pistachio/base-files/lib/upgrade/platform.sh
+++ b/target/linux/pistachio/base-files/lib/upgrade/platform.sh
@@ -6,15 +6,13 @@
 # See /LICENSE for more information.
 #
 
-. /lib/pistachio.sh
-
 RAMFS_COPY_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /bin/mkdir /bin/dmesg /bin/sed /bin/grep"
 RAMFS_COPY_DATA="/etc/fw_env.config"
 REQUIRE_IMAGE_METADATA=0
 
 platform_check_image()
 {
-       local board=$(pistachio_board_name)
+       local board=$(board_name)
 
        nand_do_platform_check $board $1
        return $?
@@ -32,7 +30,7 @@ platform_pre_upgrade() {
 }
 
 platform_nand_pre_upgrade() {
-       local board=$(pistachio_board_name)
+       local board=$(board_name)
 
        case "$board" in
        marduk)