aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2018-11-04 18:22:33 +0100
committerDaniel Golle <daniel@makrotopia.org>2018-11-04 21:43:36 +0100
commit4f017c871d794636c43a33c13410bbb7060a5b5b (patch)
tree936d2c7cfd1e42323e0c5600aa0be9812bd4f677 /target
parent900005ee75754ba62972ed8da6eba2d6b47e1b7f (diff)
downloadupstream-4f017c871d794636c43a33c13410bbb7060a5b5b.tar.gz
upstream-4f017c871d794636c43a33c13410bbb7060a5b5b.tar.bz2
upstream-4f017c871d794636c43a33c13410bbb7060a5b5b.zip
oxnas: switch to generic board detect
remove /lib/oxnas.sh platform-specific board-detection and use generic which is based on device-tree compatible node instead. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/oxnas/base-files/etc/board.d/01_leds8
-rwxr-xr-xtarget/linux/oxnas/base-files/etc/board.d/02_network27
-rw-r--r--target/linux/oxnas/base-files/etc/diag.sh8
-rwxr-xr-xtarget/linux/oxnas/base-files/lib/oxnas.sh66
-rw-r--r--target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh9
5 files changed, 33 insertions, 85 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
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