hikey: Set default value for CONSOLE_UART_BASE in conf.mk

Signed-off-by: Victor Chong <[email protected]> Reviewed-by: Jerome Forissier <[email protected]>
OP-TEE · Jul 17, 2017 · e0bb0be · e0bb0be
1 parent c4b29c2
commit e0bb0be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/arch/arm/plat-hikey/conf.mk b/core/arch/arm/plat-hikey/conf.mk
@@ -47,6 +47,10 @@ CFG_SECURE_DATA_PATH ?= y
 CFG_TEE_SDP_MEM_BASE ?= 0x3E800000
 CFG_TEE_SDP_MEM_SIZE ?= 0x00400000
 
+ifeq ($(PLATFORM_FLAVOR),hikey)
+CFG_CONSOLE_UART ?= 3
+endif
+
 ifeq ($(PLATFORM_FLAVOR),hikey960)
 CFG_CONSOLE_UART ?= 6
 endif
diff --git a/core/arch/arm/plat-hikey/platform_config.h b/core/arch/arm/plat-hikey/platform_config.h
@@ -36,10 +36,10 @@
 
 #define PL011_UART0_BASE	0xF8015000
 #define PL011_UART3_BASE	0xF7113000
-#if defined(CFG_CONSOLE_UART) && (CFG_CONSOLE_UART == 0)
-#define CONSOLE_UART_BASE	PL011_UART0_BASE
-#elif !defined(CFG_CONSOLE_UART) || (CFG_CONSOLE_UART == 3)
+#if (CFG_CONSOLE_UART == 3)
 #define CONSOLE_UART_BASE	PL011_UART3_BASE
+#elif (CFG_CONSOLE_UART == 0)
+#define CONSOLE_UART_BASE	PL011_UART0_BASE
 #else
 #error Unknown console UART
 #endif