oxnas: squash-pick commits from master branch
authorDaniel Golle <daniel@makrotopia.org>
Sun, 4 Nov 2018 17:22:33 +0000 (18:22 +0100)
committerDaniel Golle <daniel@makrotopia.org>
Sun, 11 Nov 2018 15:49:07 +0000 (16:49 +0100)
 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>
13 files changed:
target/linux/oxnas/base-files/etc/board.d/01_leds
target/linux/oxnas/base-files/etc/board.d/02_network
target/linux/oxnas/base-files/etc/diag.sh
target/linux/oxnas/base-files/lib/oxnas.sh [deleted file]
target/linux/oxnas/base-files/lib/preinit/01_preinit_do_oxnas.sh [deleted file]
target/linux/oxnas/base-files/lib/upgrade/platform.sh
target/linux/oxnas/config-4.14
target/linux/oxnas/files/arch/arm/boot/dts/ox820-akitio-mycloud.dts
target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts
target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts
target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
target/linux/oxnas/image/ox820.mk
target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch [new file with mode: 0644]

index 5d665093f670c0e895a92174bbeb1f7349acd051..66a24e108d902e990be54e1eae5b9251b7b631c8 100755 (executable)
@@ -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"
                ;;
 
index 7ecaed51bfe6acf21fc0f722e6844d984bde0e50..7b657cd108cc6e09b9b1f57c0e117cf4d8268099 100755 (executable)
@@ -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
index fd3bc3b33663c5e465a47252b1d132652dbb4ada..b8a51c2769c038ef6abeceada2b518b9d070a766 100644 (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
diff --git a/target/linux/oxnas/base-files/lib/oxnas.sh b/target/linux/oxnas/base-files/lib/oxnas.sh
deleted file mode 100755 (executable)
index 671dd05..0000000
+++ /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 (file)
index ca7bce1..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-do_oxnas() {
-       . /lib/oxnas.sh
-
-       oxnas_board_detect
-}
-
-boot_hook_add preinit_main do_oxnas
index 059d75f9a90d94723c564c2a41a45509ccba1e16..9e8a94b5014d30ff44dca12cd39587939c286fa7 100644 (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() {
index 56b54dd59d6001059fbf11d9b229c59019024b9b..49201b6875d8bb493c03e4ed54fd415c888e9072 100644 (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
index c0bf34c3f40f88df1ce81f4c17016f3c788b8d19..90ea15d400a33dae069847f7f6c751c3e2f65766 100644 (file)
@@ -10,7 +10,7 @@
        compatible = "akitio,mycloud", "oxsemi,ox820";
 
        chosen {
-               bootargs = "earlyprintk";
+               bootargs = "earlyprintk console=ttyS0,115200";
                stdout-path = "serial0:115200n8";
        };
 
index 363fd30d20346dfe140c65dbc2e958ae4ed953fe..2872d40e3d4995aed45a2da2a9fd3364ced936b3 100644 (file)
@@ -15,7 +15,7 @@
        compatible = "cloudengines,pogoplugpro", "oxsemi,ox820";
 
        chosen {
-               bootargs = "earlyprintk";
+               bootargs = "earlyprintk console=ttyS0,115200";
                stdout-path = "serial0:115200n8";
        };
 
index 834ea77653da6828a2b9320d0c96bdca1cbc3c63..cc8d640ee0ae4ae92d5d2223060db9519f461c9b 100644 (file)
@@ -10,7 +10,7 @@
        compatible = "mitrastar,stg-212", "oxsemi,ox820";
 
        chosen {
-               bootargs = "earlyprintk";
+               bootargs = "earlyprintk console=ttyS0,115200";
                stdout-path = "serial0:115200n8";
        };
 
index badfa2578e3ef2bc1ffb8e1e447577e1d4a65894..9186d085855715384f6b160bc655d75c8ccb6016 100644 (file)
        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 {
index 9d41270a37d51138d2d00acf579dd8774ea8d319..60f85d11da5e8a5ff870724d5f490be4842da8af 100644 (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
diff --git a/target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch b/target/linux/oxnas/patches-4.14/010-add-console-to-pogoplogv3-bootargs.patch
new file mode 100644 (file)
index 0000000..56e0eaf
--- /dev/null
@@ -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";
+       };