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/etc | |
| 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/etc')
| -rwxr-xr-x | target/linux/oxnas/base-files/etc/board.d/01_leds | 8 | ||||
| -rwxr-xr-x | target/linux/oxnas/base-files/etc/board.d/02_network | 27 | ||||
| -rw-r--r-- | target/linux/oxnas/base-files/etc/diag.sh | 8 |
3 files changed, 33 insertions, 10 deletions
diff --git a/target/linux/oxnas/base-files/etc/board.d/01_leds b/target/linux/oxnas/base-files/etc/board.d/01_leds index 5d665093f6..66a24e108d 100755 --- a/target/linux/oxnas/base-files/etc/board.d/01_leds +++ b/target/linux/oxnas/base-files/etc/board.d/01_leds @@ -6,17 +6,17 @@ board=$(board_name) board_config_update case $board in - akitio) + "akitio,myloud") ucidef_set_led_default "status" "status" "akitio:red:status" "0" ;; - stg212) + "mitrastar,stg-212") ucidef_set_led_default "power" "power" "zyxel:blue:status" "1" ucidef_set_led_usbdev "usb" "USB" "zyxel:orange:copy" "1-1" ;; - kd20) + "shuttle,kd20") ucidef_set_led_default "power" "power" "kd20:blue:status" "1" ;; - pogoplug-pro | pogoplug-v3) + "cloudengines,pogoplug"*) ucidef_set_led_default "power" "power" "pogoplug:blue:internal" "1" ;; diff --git a/target/linux/oxnas/base-files/etc/board.d/02_network b/target/linux/oxnas/base-files/etc/board.d/02_network index 7ecaed51bf..7b657cd108 100755 --- a/target/linux/oxnas/base-files/etc/board.d/02_network +++ b/target/linux/oxnas/base-files/etc/board.d/02_network @@ -2,14 +2,37 @@ . /lib/functions/uci-defaults.sh . /lib/functions/system.sh -. /lib/oxnas.sh board_config_update lan_mac="" +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" +} + case "$(board_name)" in - kd20) + "shuttle,kd20") lan_mac="$(legacy_boot_mac_adr)" ;; esac diff --git a/target/linux/oxnas/base-files/etc/diag.sh b/target/linux/oxnas/base-files/etc/diag.sh index fd3bc3b336..b8a51c2769 100644 --- a/target/linux/oxnas/base-files/etc/diag.sh +++ b/target/linux/oxnas/base-files/etc/diag.sh @@ -6,16 +6,16 @@ get_status_led() { case $(board_name) in - akitio) + "akitio,mycloud") status_led="akitio:red:status" ;; - stg212) + "mitrastar,stg-212") status_led="zyxel:blue:status" ;; - kd20) + "shuttle,kd20") status_led="kd20:blue:status" ;; - pogoplug-pro | pogoplug-v3) + "cloudengines,pogoplug"*) status_led="pogoplug:blue:internal" ;; esac |