From cb11eaf5dd2f443f46f1f73109a16c15551c2f3a Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 23 Oct 2021 21:01:24 +0200 Subject: [PATCH] image: define DEVICE_DTS_DELIMITER as per-device variable DEVICE_DTS_DELIMITER needs to be in the DEFAULT_DEVICE_VARS list to work as expected. This was missing from the original version and got overlooked. Fixes: fd6790864739 ("scripts: mkits.sh: Allow legacy @ mode for dts creation") Signed-off-by: Christian Lamparter --- include/image.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/image.mk b/include/image.mk index 1150f84ce5..275a0adcac 100644 --- a/include/image.mk +++ b/include/image.mk @@ -394,6 +394,7 @@ define Device/Init DEVICE_DTS := DEVICE_DTS_CONFIG := + DEVICE_DTS_DELIMITER := DEVICE_DTS_DIR := DEVICE_DTS_OVERLAY := DEVICE_FDT_NUM := @@ -419,8 +420,8 @@ DEFAULT_DEVICE_VARS := \ DEVICE_NAME KERNEL KERNEL_INITRAMFS KERNEL_INITRAMFS_IMAGE KERNEL_SIZE \ CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \ VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \ - DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_DTS_OVERLAY DEVICE_FDT_NUM \ - DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \ + DEVICE_DTS_CONFIG DEVICE_DTS_DELIMITER DEVICE_DTS_DIR DEVICE_DTS_OVERLAY \ + DEVICE_FDT_NUM DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \ SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \ UBOOT_PATH IMAGE_SIZE \ DEVICE_PACKAGES DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \