From 97491078f40d22b0de41675a35c8bcc667c885c3 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Mon, 10 Feb 2020 16:33:23 +0100 Subject: [PATCH] mvebu: image: keep global DTS_DIR intact Don't rewrite global DTS_DIR, instead, use proper variable for specifying devices dts directory. For consistency, also specify the variable in default profile, as suggested by Adrian Schmutzler. Signed-off-by: Tomasz Maciej Nowak --- target/linux/mvebu/image/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index aeabffdca2..d73f3e20fc 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -78,6 +78,7 @@ endef define Device/Default PROFILES := Default DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) + DEVICE_DTS_DIR := $(DTS_DIR) BOARD_NAME = $$(DEVICE_DTS) KERNEL_NAME := zImage KERNEL := kernel-bin | append-dtb | uImage none @@ -93,7 +94,7 @@ DEVICE_VARS += BOOT_SCRIPT UBOOT define Device/Default-arm64 BOOT_SCRIPT := generic-arm64 - DTS_DIR := $(DTS_DIR)/marvell + DEVICE_DTS_DIR := $(DTS_DIR)/marvell IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := boot-scr | boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata KERNEL_NAME := Image -- 2.25.1