TEE-273: Cleanup UART definition

Move UART definition out of th eh file and into Makefile

Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>

11 files changed, 23 insertions, 45 deletions

diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
index 45ae4a97..ad29ece8 100644
--- a/core/arch/arm/plat-imx/conf.mk
+++ b/core/arch/arm/plat-imx/conf.mk
@@ -183,6 +183,7 @@ CFG_DDR_SIZE ?= 0x20000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = n
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6ul9x9evk))
@@ -193,6 +194,7 @@ CFG_DDR_SIZE ?= 0x10000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = n
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6ullevk))
@@ -203,6 +205,7 @@ CFG_DDR_SIZE ?= 0x20000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = n
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6qsabrelite))
@@ -213,6 +216,7 @@ CFG_DDR_SIZE ?= 0x40000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART2_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6qsabresd))
@@ -223,6 +227,7 @@ CFG_DDR_SIZE ?= 0x40000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6qsabreauto))
@@ -233,6 +238,7 @@ CFG_DDR_SIZE ?= 0x80000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART4_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6dlsabresd))
@@ -243,6 +249,7 @@ CFG_DDR_SIZE ?= 0x40000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6dlsabreauto))
@@ -253,6 +260,7 @@ CFG_DDR_SIZE ?= 0x80000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART4_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6qpsabresd))
@@ -263,6 +271,7 @@ CFG_DDR_SIZE ?= 0x40000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6qpsabreauto))
@@ -275,6 +284,7 @@ CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
 # Currently there is a board rework to enable TZASC on i.MX6QP
 CFG_TZC380 = n
+CFG_UART_BASE ?= UART4_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6sxsabresd))
@@ -285,6 +295,7 @@ CFG_DDR_SIZE ?= 0x40000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6sxsabreauto))
@@ -295,6 +306,7 @@ CFG_DDR_SIZE ?= 0x80000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6slevk))
@@ -305,6 +317,7 @@ CFG_DDR_SIZE ?= 0x40000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = n
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx6sllevk))
@@ -315,6 +328,7 @@ CFG_DDR_SIZE ?= 0x80000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = n
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx7dsabresd))
@@ -325,6 +339,7 @@ CFG_DDR_SIZE ?= 0x40000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = y
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx7swarp7))
@@ -336,6 +351,7 @@ CFG_DT ?= y
 CFG_PSCI_ARM32 ?= y
 # TZASC config is not defined for the warp board
 CFG_TZC380 = n
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx7ulpevk))
@@ -346,14 +362,17 @@ CFG_DDR_SIZE ?= 0x40000000
 CFG_PSCI_ARM32 ?= y
 CFG_BOOT_SYNC_CPU = n
 CFG_BOOT_SECONDARY_REQUEST = n
+CFG_UART_BASE ?= UART4_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx8mqevk))
 CFG_DDR_SIZE ?= 0xC0000000
+CFG_UART_BASE ?= UART1_BASE
 endif
 
 ifneq (,$(filter $(PLATFORM_FLAVOR),mx8mmevk))
 CFG_DDR_SIZE ?= 0x80000000
+CFG_UART_BASE ?= UART2_BASE
 endif
 
 ifeq ($(filter y, $(CFG_PSCI_ARM32)), y)
diff --git a/core/arch/arm/plat-imx/config/imx6qdlsolo.h b/core/arch/arm/plat-imx/config/imx6qdlsolo.h
index 7b2bfcf2..d5f73052 100644
--- a/core/arch/arm/plat-imx/config/imx6qdlsolo.h
+++ b/core/arch/arm/plat-imx/config/imx6qdlsolo.h
@@ -31,19 +31,6 @@
 #ifndef CONFIG_IMX6QDLSOLO_H
 #define CONFIG_IMX6QDLSOLO_H
 
-#ifndef CFG_UART_BASE
-/* Board specific console UART */
-#if defined(PLATFORM_FLAVOR_mx6qsabrelite)
-#define CFG_UART_BASE		UART2_BASE
-#elif defined(PLATFORM_FLAVOR_mx6qpsabreauto) || \
-	defined(PLATFORM_FLAVOR_mx6qsabreauto) || \
-	defined(PLATFORM_FLAVOR_mx6dlsabreauto)
-#define CFG_UART_BASE		UART4_BASE
-#else
-#define CFG_UART_BASE		UART1_BASE
-#endif
-#endif
-
 #define DRAM0_BASE		0x10000000
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/config/imx6sl.h b/core/arch/arm/plat-imx/config/imx6sl.h
index b3a6aaeb..72f6718d 100644
--- a/core/arch/arm/plat-imx/config/imx6sl.h
+++ b/core/arch/arm/plat-imx/config/imx6sl.h
@@ -7,10 +7,6 @@
 #ifndef _CONFIG_IMX6SL_H
 #define _CONFIG_IMX6SL_H
 
-#ifndef CFG_UART_BASE
-#define CFG_UART_BASE	(UART1_BASE)
-#endif
-
 #define DRAM0_BASE		0x80000000
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/config/imx6sll.h b/core/arch/arm/plat-imx/config/imx6sll.h
index 433bf616..61c2825f 100644
--- a/core/arch/arm/plat-imx/config/imx6sll.h
+++ b/core/arch/arm/plat-imx/config/imx6sll.h
@@ -7,10 +7,6 @@
 #ifndef _CONFIG_IMX6SLL_H
 #define _CONFIG_IMX6SLL_H
 
-#ifndef CFG_UART_BASE
-#define CFG_UART_BASE	(UART1_BASE)
-#endif
-
 #define DRAM0_BASE		0x80000000
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/config/imx6sx.h b/core/arch/arm/plat-imx/config/imx6sx.h
index 6973080c..686ad46f 100644
--- a/core/arch/arm/plat-imx/config/imx6sx.h
+++ b/core/arch/arm/plat-imx/config/imx6sx.h
@@ -8,10 +8,6 @@
 #ifndef __CONFIG_IMX6SX_H
 #define __CONFIG_IMX6SX_H
 
-#ifndef CFG_UART_BASE
-#define CFG_UART_BASE	(UART1_BASE)
-#endif
-
 #define DRAM0_BASE		0x80000000
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/config/imx6ul.h b/core/arch/arm/plat-imx/config/imx6ul.h
index e2e40034..0456679c 100644
--- a/core/arch/arm/plat-imx/config/imx6ul.h
+++ b/core/arch/arm/plat-imx/config/imx6ul.h
@@ -13,10 +13,6 @@
 #error "i.MX 6UL/6ULL does not support LPAE"
 #endif
 
-#ifndef CFG_UART_BASE
-#define CFG_UART_BASE	(UART1_BASE)
-#endif
-
 #define DRAM0_BASE		0x80000000
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/config/imx7.h b/core/arch/arm/plat-imx/config/imx7.h
index 32d56613..cf2a4fda 100644
--- a/core/arch/arm/plat-imx/config/imx7.h
+++ b/core/arch/arm/plat-imx/config/imx7.h
@@ -7,10 +7,6 @@
 #ifndef __CONFIG_IMX7_H
 #define __CONFIG_IMX7_H
 
-#ifndef CFG_UART_BASE
-#define CFG_UART_BASE	(UART1_BASE)
-#endif
-
 #define DRAM0_BASE		0x80000000
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/config/imx7ulp.h b/core/arch/arm/plat-imx/config/imx7ulp.h
index 4c9f3153..99ee8b6e 100644
--- a/core/arch/arm/plat-imx/config/imx7ulp.h
+++ b/core/arch/arm/plat-imx/config/imx7ulp.h
@@ -7,10 +7,6 @@
 #ifndef CONFIG_IMX7ULP_H
 #define CONFIG_IMX7ULP_H
 
-#ifndef CFG_UART_BASE
-#define CFG_UART_BASE	(UART4_BASE)
-#endif
-
 #define DRAM0_BASE		(0x80000000 - 0x20000000)
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/config/imx8m.h b/core/arch/arm/plat-imx/config/imx8m.h
index fa660620..89e00e48 100644
--- a/core/arch/arm/plat-imx/config/imx8m.h
+++ b/core/arch/arm/plat-imx/config/imx8m.h
@@ -7,10 +7,6 @@
 #ifndef CONFIG_IMX8M_H
 #define CONFIG_IMX8M_H
 
-#ifndef CFG_UART_BASE
-#define CFG_UART_BASE	(UART1_BASE)
-#endif
-
 #define DRAM0_BASE		0x40000000
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/config/imx8mm.h b/core/arch/arm/plat-imx/config/imx8mm.h
index d21ca932..c35e750e 100644
--- a/core/arch/arm/plat-imx/config/imx8mm.h
+++ b/core/arch/arm/plat-imx/config/imx8mm.h
@@ -7,10 +7,6 @@
 #ifndef CONFIG_IMX8MM_H
 #define CONFIG_IMX8MM_H
 
-#ifndef CFG_UART_BASE
-#define CFG_UART_BASE	(UART2_BASE)
-#endif
-
 #define DRAM0_BASE		0x40000000
 #define DRAM0_SIZE		CFG_DDR_SIZE
 
diff --git a/core/arch/arm/plat-imx/platform_config.h b/core/arch/arm/plat-imx/platform_config.h
index 774c9ddc..9cf7d158 100644
--- a/core/arch/arm/plat-imx/platform_config.h
+++ b/core/arch/arm/plat-imx/platform_config.h
@@ -71,6 +71,10 @@
 #error "Unknown platform flavor"
 #endif
 
+#ifndef CFG_UART_BASE
+/* Board specific console UART */
+#error "CFG_UART_BASE not defined!"
+#endif
 
 #ifndef CFG_TEE_RESERVED_SIZE
 #define CFG_TEE_RESERVED_SIZE 0x02000000