EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pistachio: remove pistachio_board_name, use the generic function

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2017-03-17 16:56:40 +01:00
parent 0d271cef80
commit eb98bf605e
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/boot/uboot-envtools/files/pistachio
View File

@ -10,11 +10,10 @@
touch /etc/config/ubootenv touch /etc/config/ubootenv
. /lib/pistachio.sh
. /lib/uboot-envtools.sh . /lib/uboot-envtools.sh
. /lib/functions.sh . /lib/functions.sh
board=$(pistachio_board_name) board=$(board_name)
case "$board" in case "$board" in
marduk) marduk)

1
target/linux/pistachio/base-files/etc/diag.sh
View File

@ -7,7 +7,6 @@
# #
. /lib/functions/leds.sh . /lib/functions/leds.sh
. /lib/pistachio.sh
status_led="marduk:red:heartbeat" status_led="marduk:red:heartbeat"

8
target/linux/pistachio/base-files/lib/pistachio.sh
View File

@ -32,11 +32,3 @@ pistachio_board_detect() {
echo "$PISTACHIO_BOARD_NAME" > /tmp/sysinfo/board_name echo "$PISTACHIO_BOARD_NAME" > /tmp/sysinfo/board_name
echo "$PISTACHIO_MODEL" > /tmp/sysinfo/model 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"
}

6
target/linux/pistachio/base-files/lib/upgrade/platform.sh
View File

@ -6,15 +6,13 @@
# See /LICENSE for more information. # 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_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /bin/mkdir /bin/dmesg /bin/sed /bin/grep"
RAMFS_COPY_DATA="/etc/fw_env.config" RAMFS_COPY_DATA="/etc/fw_env.config"
REQUIRE_IMAGE_METADATA=0 REQUIRE_IMAGE_METADATA=0
platform_check_image() platform_check_image()
{ {
local board=$(pistachio_board_name) local board=$(board_name)
nand_do_platform_check $board $1 nand_do_platform_check $board $1
return $? return $?
@ -32,7 +30,7 @@ platform_pre_upgrade() {
} }
platform_nand_pre_upgrade() { platform_nand_pre_upgrade() {
local board=$(pistachio_board_name) local board=$(board_name)
case "$board" in case "$board" in
marduk) marduk)