commit fc8248002538ad7d79994ff6cb3b7ecb5b6e30d8
author Sandrine Bailleux <sandrine.bailleux@arm.com> Wed Mar 11 09:37:19 2020 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Wed Mar 11 09:37:19 2020 +0000
tree 364d137f5ec49d75ac3544d83a25cb75c8ddd844
parent 8ef1217799e6b16e588e7cac76d64adf3823d935
parent 9fc5cb66872dbbf98548fe3d190a2345949959e2

Merge "plat: imx8mm: provide uart base as build option" into integration

plat/imx/imx8m/imx8mm/include/platform_def.h

diff --git a/plat/imx/imx8m/imx8mm/include/platform_def.h b/plat/imx/imx8m/imx8mm/include/platform_def.h
index 56caab7..f25ceb0 100644
--- a/plat/imx/imx8m/imx8mm/include/platform_def.h
+++ b/plat/imx/imx8m/imx8mm/include/platform_def.h
@@ -47,7 +47,6 @@
 
 #define HAB_RVT_BASE			U(0x00000900) /* HAB_RVT for i.MX8MM */
 
-#define IMX_BOOT_UART_BASE		U(0x30890000)
 #define IMX_BOOT_UART_CLK_IN_HZ		24000000 /* Select 24MHz oscillator */
 
 #define PLAT_CRASH_UART_BASE		IMX_BOOT_UART_BASE

plat/imx/imx8m/imx8mm/platform.mk

diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk
index c0cb6c2..e28f739 100644
--- a/plat/imx/imx8m/imx8mm/platform.mk
+++ b/plat/imx/imx8m/imx8mm/platform.mk
@@ -51,3 +51,6 @@
 
 BL32_SIZE		?=	0x2000000
 $(eval $(call add_define,BL32_SIZE))
+
+IMX_BOOT_UART_BASE	?=	0x30890000
+$(eval $(call add_define,IMX_BOOT_UART_BASE))