From 35a7f790967de6d887bed8d506c11ebb98da65d3 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 11 Mar 2019 03:40:44 +0100 Subject: [PATCH] oxnas: use generic filenames for image and DTS Signed-off-by: Daniel Golle --- ...dts => ox820-cloudengines-pogoplugpro.dts} | 0 ...stg212.dts => ox820-mitrastar-stg-212.dts} | 0 target/linux/oxnas/image/ox820.mk | 37 +++++++++---------- ...-pogoplug-series-3-compatible-string.patch | 11 ++++++ 4 files changed, 28 insertions(+), 20 deletions(-) rename target/linux/oxnas/files/arch/arm/boot/dts/{ox820-cloudengines-pogoplug-pro.dts => ox820-cloudengines-pogoplugpro.dts} (100%) rename target/linux/oxnas/files/arch/arm/boot/dts/{ox820-mitrastar-stg212.dts => ox820-mitrastar-stg-212.dts} (100%) create mode 100644 target/linux/oxnas/patches-4.14/040-pogoplug-series-3-compatible-string.patch diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplugpro.dts similarity index 100% rename from target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplug-pro.dts rename to target/linux/oxnas/files/arch/arm/boot/dts/ox820-cloudengines-pogoplugpro.dts diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg-212.dts similarity index 100% rename from target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg212.dts rename to target/linux/oxnas/files/arch/arm/boot/dts/ox820-mitrastar-stg-212.dts diff --git a/target/linux/oxnas/image/ox820.mk b/target/linux/oxnas/image/ox820.mk index 7f81fd2f59..b7526cd86e 100644 --- a/target/linux/oxnas/image/ox820.mk +++ b/target/linux/oxnas/image/ox820.mk @@ -11,6 +11,8 @@ define Device/Default SUBPAGESIZE := 512 FILESYSTEMS := squashfs ubifs PROFILES = Default $$(DTS) + SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) + DEVICE_DTS := ox820-$(subst _,-,$(1)) KERNEL := kernel-bin | append-dtb | uImage none IMAGES := ubinized.bin sysupgrade.tar IMAGE/ubinized.bin := append-ubi @@ -36,35 +38,31 @@ define Build/encrypt-3des openssl enc -des3 -a -k $(1) -in $@ -out $@.new && mv $@.new $@ endef -define Device/akitio-mycloud - DEVICE_DTS := ox820-akitio-mycloud +define Device/akitio_mycloud DEVICE_TITLE := Akition myCloud (mini) / SilverStone DC01 - SUPPORTED_DEVICES := akitio,mycloud akitio + SUPPORTED_DEVICES += akitio DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ata-oxnas-sata kmod-usb-ledtrig-usbport \ kmod-i2c-gpio kmod-rtc-ds1307 endef -TARGET_DEVICES += akitio-mycloud +TARGET_DEVICES += akitio_mycloud -define Device/cloudengines-pogoplug-pro - DEVICE_DTS := ox820-cloudengines-pogoplug-pro +define Device/cloudengines_pogoplugpro DEVICE_TITLE := Cloud Engines PogoPlug Pro (with mPCIe) - SUPPORTED_DEVICES := cloudengines,pogoplugpro pogoplug-pro + SUPPORTED_DEVICES += pogoplug-pro DEVICE_PACKAGES := kmod-usb2-oxnas kmod-usb-ledtrig-usbport endef -TARGET_DEVICES += cloudengines-pogoplug-pro +TARGET_DEVICES += cloudengines_pogoplugpro -define Device/cloudengines-pogoplug-series-3 - DEVICE_DTS := ox820-cloudengines-pogoplug-series-3 +define Device/cloudengines_pogoplug-series-3 DEVICE_TITLE := Cloud Engines PogoPlug Series V3 (without mPCIe) - SUPPORTED_DEVICES := cloudengines,pogoplugv3 pogoplug-v3 + SUPPORTED_DEVICES += cloudengines,pogoplugv3 pogoplug-v3 DEVICE_PACKAGES := kmod-usb2-oxnas kmod-usb-ledtrig-usbport endef -TARGET_DEVICES += cloudengines-pogoplug-series-3 +TARGET_DEVICES += cloudengines_pogoplug-series-3 -define Device/shuttle-kd20 - DEVICE_DTS := ox820-shuttle-kd20 +define Device/shuttle_kd20 DEVICE_TITLE := Shuttle KD20 - SUPPORTED_DEVICES := shuttle,kd20 kd20 + SUPPORTED_DEVICES += kd20 KERNEL := kernel-bin | append-dtb | uImage none KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-factory KERNEL_INITRAMFS_SUFFIX := .tar.gz @@ -74,14 +72,13 @@ define Device/shuttle-kd20 kmod-hwmon-core kmod-hwmon-gpiofan \ kmod-md-mod kmod-md-raid0 kmod-md-raid1 kmod-fs-ext4 kmod-fs-xfs endef -TARGET_DEVICES += shuttle-kd20 +TARGET_DEVICES += shuttle_kd20 -define Device/mitrastar-stg212 - DEVICE_DTS := ox820-mitrastar-stg212 +define Device/mitrastar_stg-212 DEVICE_TITLE := MitraStar STG-212 - SUPPORTED_DEVICES := mitrastar,stg-212 stg212 + SUPPORTED_DEVICES += stg212 KERNEL := kernel-bin | append-dtb | uImage none DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ata-oxnas-sata kmod-fs-ext4 kmod-fs-xfs \ kmod-usb-ledtrig-usbport endef -TARGET_DEVICES += mitrastar-stg212 +TARGET_DEVICES += mitrastar_stg-212 diff --git a/target/linux/oxnas/patches-4.14/040-pogoplug-series-3-compatible-string.patch b/target/linux/oxnas/patches-4.14/040-pogoplug-series-3-compatible-string.patch new file mode 100644 index 0000000000..f14afd4539 --- /dev/null +++ b/target/linux/oxnas/patches-4.14/040-pogoplug-series-3-compatible-string.patch @@ -0,0 +1,11 @@ +--- a/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts ++++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts +@@ -12,7 +12,7 @@ + / { + model = "Cloud Engines PogoPlug Series 3"; + +- compatible = "cloudengines,pogoplugv3", "oxsemi,ox820"; ++ compatible = "cloudengines,pogoplug-series-3", "cloudengines,pogoplugv3", "oxsemi,ox820"; + + chosen { + bootargs = "earlyprintk console=ttyS0,115200"; -- 2.30.2