domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oxnas: squash-pick commits from master branch

Browse Source 
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>
This commit is contained in:
Daniel Golle
2018-11-04 18:22:33 +01:00
parent f2a6d39b95
commit 4f40d4ca73
13 changed files with 56 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/oxnas/base-files/etc/board.d/01_leds
View File

@@ -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"
;;

27
target/linux/oxnas/base-files/etc/board.d/02_network
View File

@@ -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

8
target/linux/oxnas/base-files/etc/diag.sh
View File

@@ -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

66
target/linux/oxnas/base-files/lib/oxnas.sh
View File

@@ -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
}

9
target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh
View File

@@ -1,9 +0,0 @@
#!/bin/sh
do_oxnas() {
. /lib/oxnas.sh
oxnas_board_detect
}
boot_hook_add preinit_main do_oxnas

11
target/linux/oxnas/base-files/lib/upgrade/platform.sh
View File

@@ -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() {

10
target/linux/oxnas/config-4.14
View File

@@ -80,16 +80,6 @@ CONFIG_CRC16=y
# CONFIG_CRC32_SARWATE is not set
CONFIG_CRC32_SLICEBY8=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_ACOMP2=y
# CONFIG_CRYPTO_ARC4 is not set
CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_DEFLATE=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_LZO=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_DEBUG_ALIGN_RODATA=y
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_USER is not set

2
target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
View File

@@ -10,7 +10,7 @@
compatible = "akitio,mycloud", "oxsemi,ox820";
chosen {
bootargs = "earlyprintk";
bootargs = "earlyprintk console=ttyS0,115200";
stdout-path = "serial0:115200n8";
};

2
target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts
View File

@@ -15,7 +15,7 @@
compatible = "cloudengines,pogoplugpro", "oxsemi,ox820";
chosen {
bootargs = "earlyprintk";
bootargs = "earlyprintk console=ttyS0,115200";
stdout-path = "serial0:115200n8";
};

2
target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts
View File

@@ -10,7 +10,7 @@
compatible = "mitrastar,stg-212", "oxsemi,ox820";
chosen {
bootargs = "earlyprintk";
bootargs = "earlyprintk console=ttyS0,115200";
stdout-path = "serial0:115200n8";
};

6
target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
View File

@@ -10,13 +10,13 @@
compatible = "shuttle,kd20", "oxsemi,ox820";
chosen {
bootargs = "earlyprintk";
bootargs = "earlyprintk console=ttyS0,115200";
stdout-path = "serial0:115200n8";
};
memory {
/* 128Mbytes DDR */
reg = <0x60000000 0x8000000>;
/* 256Mbytes DDR */
reg = <0x60000000 0x10000000>;
};
aliases {

5
target/linux/oxnas/image/ox820.mk
View File

@@ -39,6 +39,7 @@ endef
define Device/akitio-mycloud
DEVICE_DTS := ox820-akitio-mycloud
DEVICE_TITLE := Akition myCloud (mini) / SilverStone DC01
SUPPORTED_DEVICES := akitio,mycloud akitio
DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ata-oxnas-sata kmod-ledtrig-usbdev \
kmod-i2c-gpio kmod-rtc-ds1307
endef
@@ -47,6 +48,7 @@ TARGET_DEVICES += akitio-mycloud
define Device/cloudengines-pogoplug-pro
DEVICE_DTS := ox820-cloudengines-pogoplug-pro
DEVICE_TITLE := Cloud Engines PogoPlug Pro (with mPCIe)
SUPPORTED_DEVICES := cloudengines,pogoplugpro pogoplug-pro
DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ledtrig-usbdev
endef
TARGET_DEVICES += cloudengines-pogoplug-pro
@@ -54,6 +56,7 @@ TARGET_DEVICES += cloudengines-pogoplug-pro
define Device/cloudengines-pogoplug-series-3
DEVICE_DTS := ox820-cloudengines-pogoplug-series-3
DEVICE_TITLE := Cloud Engines PogoPlug Series V3 (without mPCIe)
SUPPORTED_DEVICES := cloudengines,pogoplugv3 pogoplug-v3
DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ledtrig-usbdev
endef
TARGET_DEVICES += cloudengines-pogoplug-series-3
@@ -61,6 +64,7 @@ TARGET_DEVICES += cloudengines-pogoplug-series-3
define Device/shuttle-kd20
DEVICE_DTS := ox820-shuttle-kd20
DEVICE_TITLE := Shuttle KD20
SUPPORTED_DEVICES := shuttle,kd20 kd20
KERNEL := kernel-bin | append-dtb | uImage none
KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-factory
KERNEL_INITRAMFS_SUFFIX := .tar.gz
@@ -75,6 +79,7 @@ TARGET_DEVICES += shuttle-kd20
define Device/mitrastar-stg212
DEVICE_DTS := ox820-mitrastar-stg212
DEVICE_TITLE := MitraStar STG-212
SUPPORTED_DEVICES := mitrastar,stg-212 stg212
KERNEL := kernel-bin | append-dtb | uImage none
DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ata-oxnas-sata kmod-ledtrig-usbdev
endef

11
target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts 2018-08-14 18:03:56.542679083 +0200
+++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts 2018-11-04 18:19:35.154886643 +0100
@@ -15,7 +15,7 @@
compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
chosen {
- bootargs = "earlyprintk";
+ bootargs = "earlyprintk console=ttyS0,115200";
stdout-path = "serial0:115200n8";
};