Commit cc1ac533 authored by Grant Likely's avatar Grant Likely
Browse files

By default set a DTB_TARGET for the platform



This doesn't actually use DTB_TARGET by default, but it does set up the
variable so that the 'make dtb' target does something.
Signed-off-by: Grant Likely's avatarGrant Likely <grant.likely@arm.com>
parent 9e61dd89
ifeq ($(CROSS_COMPILE),) ifeq ($(CROSS_COMPILE),)
export CROSS_COMPILE=aarch64-linux-gnu- export CROSS_COMPILE=aarch64-linux-gnu-
endif endif
LINUX_ARCH=arm64
...@@ -160,6 +160,8 @@ INCLUDE_MK += scripts/board-$(subst ",,$(CONFIG_SYS_BOARD)).mk ...@@ -160,6 +160,8 @@ INCLUDE_MK += scripts/board-$(subst ",,$(CONFIG_SYS_BOARD)).mk
INCLUDE_MK += scripts/config-$(subst ",,$(CONFIG_SYS_CONFIG_NAME)).mk INCLUDE_MK += scripts/config-$(subst ",,$(CONFIG_SYS_CONFIG_NAME)).mk
include $(wildcard $(INCLUDE_MK)) include $(wildcard $(INCLUDE_MK))
DTB_TARGET ?= src/$(LINUX_ARCH)/$(subst ",,$(CONFIG_DEFAULT_FDT_FILE))
ifeq ($(MAKECMDGOALS),info) ifeq ($(MAKECMDGOALS),info)
info: info:
@echo 'U-Boot Config:' @echo 'U-Boot Config:'
...@@ -173,6 +175,7 @@ info: ...@@ -173,6 +175,7 @@ info:
@echo 'Derived Config:' @echo 'Derived Config:'
@echo ' TFA_PLAT=$(TFA_PLAT)' @echo ' TFA_PLAT=$(TFA_PLAT)'
@echo ' FLASH_IMAGE=$(FLASH_IMAGE)' @echo ' FLASH_IMAGE=$(FLASH_IMAGE)'
@echo ' DTB_TARGET=$(DTB_TARGET)'
@echo 'Included platform configuration files:' @echo 'Included platform configuration files:'
@$(foreach inc, $(wildcard $(INCLUDE_MK)), echo ' $(inc)';) @$(foreach inc, $(wildcard $(INCLUDE_MK)), echo ' $(inc)';)
else else
...@@ -285,7 +288,7 @@ endif # ifeq ($(dot-config),1) ...@@ -285,7 +288,7 @@ endif # ifeq ($(dot-config),1)
ifneq ($(DTB_TARGET),) ifneq ($(DTB_TARGET),)
PHONY += dtb PHONY += dtb
dtb: ${DTB_TARGET} dtb: ${DT_OUTPUT}/${DTB_TARGET}
fdtput ${DT_OUTPUT}/${DTB_TARGET} -t s / u-boot-ver `cd ${UBOOT_PATH} && git describe` fdtput ${DT_OUTPUT}/${DTB_TARGET} -t s / u-boot-ver `cd ${UBOOT_PATH} && git describe`
fdtput ${DT_OUTPUT}/${DTB_TARGET} -t s / tfa-ver `cd ${TFA_PATH} && git describe` fdtput ${DT_OUTPUT}/${DTB_TARGET} -t s / tfa-ver `cd ${TFA_PATH} && git describe`
fdtput ${DT_OUTPUT}/${DTB_TARGET} -t s / dt-ver `cd ${DT_PATH} && git describe` fdtput ${DT_OUTPUT}/${DTB_TARGET} -t s / dt-ver `cd ${DT_PATH} && git describe`
...@@ -308,7 +311,7 @@ distclean: u-boot/distclean tfa/distclean devicetree/clean optee_os/clean ...@@ -308,7 +311,7 @@ distclean: u-boot/distclean tfa/distclean devicetree/clean optee_os/clean
# ================================================ # ================================================
# Delegate to devicetree-rebasing build # Delegate to devicetree-rebasing build
# #
devicetree/%: ${DT_OUTPUT}/% devicetree/%:
${MAKE} -C ${DT_PATH} $* ${MAKE} -C ${DT_PATH} $*
# ================================================ # ================================================
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment