From 3f72f3a8b129848e75cb80b11c04112a14ab31b2 Mon Sep 17 00:00:00 2001 From: Josua Mayer Date: Mon, 22 May 2017 17:04:19 +0200 Subject: [PATCH] mvebu: clearfog: include DTB for all variants in image Installing all armada-388-clearfog-* DTBs in the same sdcard image, it now becomes much easier to swap sdcards between different device variants. Signed-off-by: Josua Mayer --- target/linux/mvebu/image/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index f112bb9a1e23..b5014161c624 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -36,7 +36,7 @@ endef define Build/boot-img rm -f $@.boot mkfs.fat -C $@.boot 16384 - $(foreach dts,$(DEVICE_DTS), mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::$(dts).dtb) + $(foreach dts,$(DEVICE_DTS), mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::$(dts).dtb;) mcopy -i $@.boot $(IMAGE_KERNEL) ::zImage mcopy -i $@.boot $@.bootscript ::boot.scr endef @@ -178,18 +178,19 @@ TARGET_DEVICES += armada-388-rd define Device/armada-388-clearfog-pro KERNEL_INSTALL := 1 - KERNEL := dtb | kernel-bin + KERNEL := kernel-bin DEVICE_TITLE := SolidRun ClearFog Pro DEVICE_PACKAGES := mkf2fs e2fsprogs swconfig kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr-cfpro | boot-img | sdcard-img | gzip | append-metadata IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2) + DEVICE_DTS := armada-388-clearfog-pro armada-388-clearfog-base endef TARGET_DEVICES += armada-388-clearfog-pro define Device/armada-388-clearfog-base KERNEL_INSTALL := 1 - KERNEL := dtb | kernel-bin + KERNEL := kernel-bin DEVICE_TITLE := SolidRun ClearFog Base DEVICE_PACKAGES := \ kmod-nls-cp437 kmod-nls-iso8859-1 \ @@ -199,6 +200,7 @@ define Device/armada-388-clearfog-base IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr-cfbase | boot-img | sdcard-img | gzip IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2) + DEVICE_DTS := armada-388-clearfog-pro armada-388-clearfog-base endef TARGET_DEVICES += armada-388-clearfog-base -- 2.30.2