pistachio: remove pistachio_board_name, use the generic function
authorFelix Fietkau <nbd@nbd.name>
Fri, 17 Mar 2017 15:56:40 +0000 (16:56 +0100)
committerFelix Fietkau <nbd@nbd.name>
Wed, 22 Mar 2017 10:43:22 +0000 (11:43 +0100)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/boot/uboot-envtools/files/pistachio
target/linux/pistachio/base-files/etc/diag.sh
target/linux/pistachio/base-files/lib/pistachio.sh
target/linux/pistachio/base-files/lib/upgrade/platform.sh

index 56bac35..ac82d9d 100644 (file)
 
 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)
index 7b55649..ed69d43 100755 (executable)
@@ -7,7 +7,6 @@
 #
 
 . /lib/functions/leds.sh
-. /lib/pistachio.sh
 
 status_led="marduk:red:heartbeat"
 
index f9a16db..9390a4c 100755 (executable)
@@ -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"
-}
index 5a886fb..2ddac78 100755 (executable)
@@ -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)