From fa24cfcb9a3b7045eead7781e84edec16ea41b6e Mon Sep 17 00:00:00 2001 From: Margarita Glushkin Date: Tue, 18 Jul 2023 08:58:15 +0300 Subject: [PATCH] plat-nuvoton: configuration change Disables DT insecure warning Co-developed-by: Hila Miranda-Kuzi Signed-off-by: Hila Miranda-Kuzi Signed-off-by: Margarita Glushkin --- core/arch/arm/plat-nuvoton/main.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/arch/arm/plat-nuvoton/main.c b/core/arch/arm/plat-nuvoton/main.c index 70b2edd552f..a163267c555 100644 --- a/core/arch/arm/plat-nuvoton/main.c +++ b/core/arch/arm/plat-nuvoton/main.c @@ -29,11 +29,7 @@ #define NPCM_MEASURE_DME 0x0E0 #define NPCM_MEASURE_SIZE 64 -<<<<<<< HEAD -static struct pl011_data console_data __nex_bss; -======= static struct ns16550_data console_data __nex_bss; ->>>>>>> a48e9fe94 (plat-nuvoton: added HUK reading) register_phys_mem_pgdir(MEM_AREA_IO_SEC, CONSOLE_UART_BASE, UART_REG_SIZE); register_phys_mem_pgdir(MEM_AREA_IO_SEC, GICD_BASE, GIC_DIST_REG_SIZE); @@ -45,13 +41,13 @@ register_ddr(DRAM0_BASE, DRAM0_SIZE); static void print_version(void) { IMSG(COLOR_MAGENTA); - IMSG(">================================================"); + IMSG("=========================================="); IMSG("OP-TEE OS Version %s", core_v_str); - IMSG(">================================================"); + IMSG("=========================================="); IMSG(COLOR_NORMAL); } -void main_init_gic(void) +void primary_init_intc(void) { if (IS_ENABLED(CFG_NPCM_DEBUG)) print_version();