diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-02-19 01:13:26 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-02-19 01:25:49 +0000 |
| commit | e3b88490885ef228456d1be39e6e84679cfe4cfb (patch) | |
| tree | 682381a3dca1f30bd057a804d88d518fa0ad3263 /include | |
| parent | c067b1e79badf94d7a01fbb8737a8134879afd1a (diff) | |
| download | upstream-e3b88490885ef228456d1be39e6e84679cfe4cfb.tar.gz upstream-e3b88490885ef228456d1be39e6e84679cfe4cfb.tar.bz2 upstream-e3b88490885ef228456d1be39e6e84679cfe4cfb.zip | |
mediatek: more clean solution for out-of-tree DTS
Use approach suggested by Adrian Schmutzler instead of introducing
another device variable.
Also revert the unnecessary white-space changes accidentally introduced
by the previous commit.
Fixed: c067b1e79b ("mediatek: move out-of-tree DTS files to dedicated dts folder")
Suggested-by: Adrian Schmutzler <mail@adrianschmutzler.de>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk index adb2734597..2530108211 100644 --- a/include/image.mk +++ b/include/image.mk @@ -31,7 +31,7 @@ mkfs_target_dir = $(if $(call param_get,pkg,$(1)),$(KDIR)/target-dir-$(call para KDIR=$(KERNEL_BUILD_DIR) KDIR_TMP=$(KDIR)/tmp -DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts$$(if $$(DTS_VENDOR),/$$(DTS_VENDOR)) +DTS_DIR:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-) IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-) @@ -416,7 +416,7 @@ 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_FDT_NUM DTS_VENDOR SOC BOARD_NAME \ + DEVICE_DTS_CONFIG DEVICE_DTS_DIR DEVICE_FDT_NUM SOC BOARD_NAME \ UIMAGE_MAGIC UIMAGE_NAME \ SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \ UBOOT_PATH IMAGE_SIZE \ |