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 <josua.mayer97@gmail.com>
openwrt-18.06
Josua Mayer 2017-05-22 17:04:19 +02:00 committed by Felix Fietkau
parent 88389bfe41
commit 3f72f3a8b1
1 changed files with 5 additions and 3 deletions

View File

@ -36,7 +36,7 @@ endef
define Build/boot-img define Build/boot-img
rm -f $@.boot rm -f $@.boot
mkfs.fat -C $@.boot 16384 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 $(IMAGE_KERNEL) ::zImage
mcopy -i $@.boot $@.bootscript ::boot.scr mcopy -i $@.boot $@.bootscript ::boot.scr
endef endef
@ -178,18 +178,19 @@ TARGET_DEVICES += armada-388-rd
define Device/armada-388-clearfog-pro define Device/armada-388-clearfog-pro
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
KERNEL := dtb | kernel-bin KERNEL := kernel-bin
DEVICE_TITLE := SolidRun ClearFog Pro DEVICE_TITLE := SolidRun ClearFog Pro
DEVICE_PACKAGES := mkf2fs e2fsprogs swconfig kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 DEVICE_PACKAGES := mkf2fs e2fsprogs swconfig kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1
IMAGES := sdcard.img.gz IMAGES := sdcard.img.gz
IMAGE/sdcard.img.gz := boot-scr-cfpro | boot-img | sdcard-img | gzip | append-metadata IMAGE/sdcard.img.gz := boot-scr-cfpro | boot-img | sdcard-img | gzip | append-metadata
IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2) IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2)
DEVICE_DTS := armada-388-clearfog-pro armada-388-clearfog-base
endef endef
TARGET_DEVICES += armada-388-clearfog-pro TARGET_DEVICES += armada-388-clearfog-pro
define Device/armada-388-clearfog-base define Device/armada-388-clearfog-base
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
KERNEL := dtb | kernel-bin KERNEL := kernel-bin
DEVICE_TITLE := SolidRun ClearFog Base DEVICE_TITLE := SolidRun ClearFog Base
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
kmod-nls-cp437 kmod-nls-iso8859-1 \ kmod-nls-cp437 kmod-nls-iso8859-1 \
@ -199,6 +200,7 @@ define Device/armada-388-clearfog-base
IMAGES := sdcard.img.gz IMAGES := sdcard.img.gz
IMAGE/sdcard.img.gz := boot-scr-cfbase | boot-img | sdcard-img | gzip IMAGE/sdcard.img.gz := boot-scr-cfbase | boot-img | sdcard-img | gzip
IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2) IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2)
DEVICE_DTS := armada-388-clearfog-pro armada-388-clearfog-base
endef endef
TARGET_DEVICES += armada-388-clearfog-base TARGET_DEVICES += armada-388-clearfog-base