From db12aae3b65d53ae9c86e93a14e0ac85f97a98a3 Mon Sep 17 00:00:00 2001
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Fri, 16 Aug 2019 17:11:54 -0700
Subject: [PATCH] Makefile: use separate bl31 for imx8mm/imx8mq
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
Makefile | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 82850d4f471..4a8cf4d5d0e 100644
--- a/Makefile
+++ b/Makefile
@@ -1068,8 +1068,19 @@ U_BOOT_ITS := u-boot.its
ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-imx/mkimage_fit_atf.sh")
U_BOOT_ITS_DEPS += u-boot-nodtb.bin
endif
+
+ifdef CONFIG_IMX8MM
+SOC_CPU = iMX8MM
+TEE_LOAD_ADDR = 0xbe000000
+ATF_LOAD_ADDR = 0x00920000
+endif
+ifdef CONFIG_IMX8MQ
+SOC_CPU = iMX8MQ
+TEE_LOAD_ADDR = 0xfe000000
+ATF_LOAD_ADDR = 0x00910000
+endif
$(U_BOOT_ITS): $(U_BOOT_ITS_DEPS) FORCE
- $(srctree)/$(CONFIG_SPL_FIT_GENERATOR) \
+ TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) BL31=bl31-${SOC_CPU}.bin $(srctree)/$(CONFIG_SPL_FIT_GENERATOR) \
$(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > $@
endif
endif
--
GitLab