oxnas: reorganize image build code and nuke profiles

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

1 files changed, 29 insertions, 37 deletions

diff --git a/target/linux/oxnas/image/Makefile b/target/linux/oxnas/image/Makefile
index 27da2da27c..a8cef46572 100644
--- a/target/linux/oxnas/image/Makefile
+++ b/target/linux/oxnas/image/Makefile
@@ -14,23 +14,28 @@ KD20_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
 POGOPLUG_PRO_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
 POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
 
-DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
+DEVICE_VARS += DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
 DEVICE_VARS += KERNEL_IN_UBI UBOOTENV_IN_UBI UBIFS_OPTS
 
 KERNEL_LOADADDR := 0x60008000
-TARGET_DEVICES = akitio kd20 pogoplug-pro pogoplug-v3 stg212
+
+define Build/ubootable
+	(dd if="$(KDIR)/u-boot.bin" bs=128k conv=sync; \
+	 dd if="$@" bs=128k conv=sync ) >> $@.new
+	@mv "$@.new" "$@"
+endef
 
 define Device/Default
-  KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
-  KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
+  KERNEL_DEPENDS = $$(wildcard $$(DTS_DIR)/ox820-$$(DTS).dts)
+  KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/ox820-$$(DTS).dtb
   KERNEL_NAME := zImage
-  KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | ubootable
+  KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(DTS_DIR)/ox820-$$(DTS).dtb | ubootable
   KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-u-boot-initramfs
   BLOCKSIZE := 128KiB
   PAGESIZE := 2048
   SUBPAGESIZE := 512
   FILESYSTEMS := squashfs ubifs
-  PROFILES := Default
+  PROFILES = Default $$(DTS)
   IMAGES := ubinized.bin sysupgrade.tar
   IMAGE/ubinized.bin := append-ubi
   IMAGE/sysupgrade.tar := sysupgrade-nand
@@ -39,52 +44,39 @@ define Device/Default
 endef
 
 define Device/akitio
-  PROFILES := Default AKITIO
-  DEVICE_DTS := ox820-akitio
+  DTS := akitio
+  DEVICE_TITLE := Akitio MyCloud mini / Silverstone DC01
+  DEVICE_PACKAGES := kmod-i2c-gpio kmod-rtc-ds1307
 endef
+TARGET_DEVICES += akitio
 
 define Device/kd20
-  PROFILES := Default KD20
-  DEVICE_DTS := ox820-kd20
+  DTS := kd20
+  DEVICE_TITLE := Shuttle KD20
+  DEVICE_PACKAGES := kmod-usb3 kmod-i2c-gpio kmod-rtc-pcf8563 kmod-gpio-beeper \
+                     kmod-hwmon-core kmod-hwmon-gpiofan
 endef
+TARGET_DEVICES += kd20
 
 define Device/pogoplug-pro
-  PROFILES := Default POGOPLUG_PRO
-  DEVICE_DTS := ox820-pogoplug-pro
+  DTS := pogoplug-pro
+  DEVICE_TITLE := Cloud Engines Pogoplug Pro (with mPCIe)
 endef
+TARGET_DEVICES += pogoplug-pro
 
 define Device/pogoplug-v3
-  PROFILES := Default POGOPLUG_V3
-  DEVICE_DTS := ox820-pogoplug-v3
+  DTS := pogoplug-v3
+  DEVICE_TITLE := Cloud Engines Pogoplug V3 (no mPCIe)
 endef
+TARGET_DEVICES += pogoplug-v3
 
 define Device/stg212
-  PROFILES := Default STG212
-  DEVICE_DTS := ox820-stg212
+  DTS := stg212
+  DEVICE_TITLE := MitraStar STG-212
 endef
+TARGET_DEVICES += stg212
 
 VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
 UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
 
-define Build/ubootable
-	(dd if="$(KDIR)/u-boot.bin" bs=128k conv=sync; \
-	 dd if="$@" bs=128k conv=sync ) >> $@.new
-	@mv "$@.new" "$@"
-endef
-
-define Image/BuildKernel
-	$(call Image/BuildKernel/Template/$(PROFILE))
-endef
-
-define Image/InstallKernel
-	$(call Image/InstallKernel/Template/$(PROFILE))
-endef
-
-define Image/Build
-	$(if $(Image/Build/$(1)), \
-		$(call Image/Build/$(1),$(1)), \
-		$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-$(1).img \
-	)
-endef
-
 $(eval $(call BuildImage))