diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2018-11-04 18:22:33 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2018-11-11 16:49:07 +0100 |
| commit | 4f40d4ca73a6da3c88804c46f8c7ab0096cdabf1 (patch) | |
| tree | 615efbd4919d57617d0ef43be9145fb10658e0b8 /target/linux/oxnas/base-files/lib | |
| parent | f2a6d39b95b279a50db834cfe6d7fc9396be1c21 (diff) | |
| download | upstream-4f40d4ca73a6da3c88804c46f8c7ab0096cdabf1.tar.gz upstream-4f40d4ca73a6da3c88804c46f8c7ab0096cdabf1.tar.bz2 upstream-4f40d4ca73a6da3c88804c46f8c7ab0096cdabf1.zip | |
oxnas: squash-pick commits from master branch
4f017c871d oxnas: switch to generic board detect
ef9b169df0 oxnas: remove stray kernel config symbols
cf7896117b oxnas: enable image metadata by setting SUPPORTED_DEVICES
9bcc08958b oxnas: add console=ttyS0,115200 argument to bootargs
b831eb5363 oxnas: kd20: correct memory size to 256MB
217fe505b6 oxnas: remove superseded sysupgrade image check
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/oxnas/base-files/lib')
| -rwxr-xr-x | target/linux/oxnas/base-files/lib/oxnas.sh | 66 | ||||
| -rw-r--r-- | target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh | 9 | ||||
| -rw-r--r-- | target/linux/oxnas/base-files/lib/upgrade/platform.sh | 11 |
3 files changed, 1 insertions, 85 deletions
diff --git a/target/linux/oxnas/base-files/lib/oxnas.sh b/target/linux/oxnas/base-files/lib/oxnas.sh deleted file mode 100755 index 671dd05fa2..0000000000 --- a/target/linux/oxnas/base-files/lib/oxnas.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013 OpenWrt.org -# - -OXNAS_BOARD_NAME= -OXNAS_MODEL= - -bootloader_cmdline_var() { - local param - local pval - for arg in $(cat /proc/device-tree/chosen/bootloader-args); do - param="$(echo $arg | cut -d'=' -f 1)" - pval="$(echo $arg | cut -d'=' -f 2-)" - - if [ "$param" = "$1" ]; then - echo "$pval" - fi - done -} - -legacy_boot_mac_adr() { - local macstr - local oIFS - macstr="$(bootloader_cmdline_var mac_adr)" - oIFS="$IFS" - IFS="," - set -- $macstr - printf "%02x:%02x:%02x:%02x:%02x:%02x" $1 $2 $3 $4 $5 $6 - IFS="$oIFS" -} - -oxnas_board_detect() { - local machine - local name - - machine=$(cat /proc/device-tree/model) - - case "$machine" in - *"Akitio MyCloud mini"*) - name="akitio" - ;; - *"MitraStar Technology Corp. STG-212"*) - name="stg212" - ;; - *"Shuttle KD20"*) - name="kd20" - ;; - *"Pogoplug Pro"*) - name="pogoplug-pro" - ;; - *"Pogoplug V3"*) - name="pogoplug-v3" - ;; - esac - - [ -z "$name" ] && name="unknown" - - [ -z "$OXNAS_BOARD_NAME" ] && OXNAS_BOARD_NAME="$name" - [ -z "$OXNAS_MODEL" ] && OXNAS_MODEL="$machine" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - echo "$OXNAS_BOARD_NAME" > /tmp/sysinfo/board_name - echo "$OXNAS_MODEL" > /tmp/sysinfo/model -} diff --git a/target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh b/target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh deleted file mode 100644 index ca7bce1054..0000000000 --- a/target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -do_oxnas() { - . /lib/oxnas.sh - - oxnas_board_detect -} - -boot_hook_add preinit_main do_oxnas diff --git a/target/linux/oxnas/base-files/lib/upgrade/platform.sh b/target/linux/oxnas/base-files/lib/upgrade/platform.sh index 059d75f9a9..9e8a94b501 100644 --- a/target/linux/oxnas/base-files/lib/upgrade/platform.sh +++ b/target/linux/oxnas/base-files/lib/upgrade/platform.sh @@ -1,16 +1,7 @@ -# -# Copyright (C) 2014 OpenWrt.org -# - REQUIRE_IMAGE_METADATA=1 platform_check_image() { - local board=$(board_name) - - [ "$ARGC" -gt 1 ] && return 1 - - nand_do_platform_check $board $1 - return $? + return 0 } platform_do_upgrade() { |