diff --git a/plat/layerscape/common/aarch64/ls_console.S b/plat/layerscape/common/aarch64/ls_console.S index f8948b4..c1bd3f7 100644 --- a/plat/layerscape/common/aarch64/ls_console.S +++ b/plat/layerscape/common/aarch64/ls_console.S @@ -81,7 +81,7 @@ .globl console_ls_16550_register /* ----------------------------------------------- - * int console_ls_16550_register(console_ls_16550_t *console, + * int console_ls_16550_register(console_t *console, * uintptr_t base, uint32_t clk, uint32_t baud) * Function to initialize and register a new 16550 * console. Storage passed in for the console struct @@ -89,7 +89,7 @@ * In: x0 - UART register base address * w1 - UART clock in Hz * w2 - Baud rate - * x3 - pointer to empty console_ls_16550_t struct + * x3 - pointer to empty console_t struct * Out: return 1 on success, 0 on error * Clobber list : x0, x1, x2, x6, x7, x14 * ----------------------------------------------- @@ -98,7 +98,7 @@ mov x7, x30 mov x6, x3 cbz x6, register_fail - str x0, [x6, #CONSOLE_T_16550_BASE] + str x0, [x6, #CONSOLE_T_BASE] bl console_ls_16550_core_init cbz x0, register_fail @@ -150,7 +150,7 @@ endfunc console_ls_16550_core_putc /* -------------------------------------------------------- - * int console_16550_putc(int c, console_ls_16550_t *console) + * int console_16550_putc(int c, console_t *console) * Function to output a character over the console. It * returns the character printed on success or -1 on error. * In : w0 - character to be printed @@ -164,7 +164,7 @@ cmp x1, #0 ASM_ASSERT(ne) #endif /* ENABLE_ASSERTIONS */ - ldr x1, [x1, #CONSOLE_T_16550_BASE] + ldr x1, [x1, #CONSOLE_T_BASE] b console_ls_16550_core_putc endfunc console_ls_16550_putc @@ -195,7 +195,7 @@ endfunc console_ls_16550_core_getc /* --------------------------------------------- - * int console_ls_16550_getc(console_ls_16550_t *console) + * int console_ls_16550_getc(console_t *console) * Function to get a character from the console. * It returns the character grabbed on success * or -1 on if no character is available. @@ -209,7 +209,7 @@ cmp x1, #0 ASM_ASSERT(ne) #endif /* ENABLE_ASSERTIONS */ - ldr x0, [x0, #CONSOLE_T_16550_BASE] + ldr x0, [x0, #CONSOLE_T_BASE] b console_ls_16550_core_getc endfunc console_ls_16550_getc @@ -239,7 +239,7 @@ endfunc console_ls_16550_core_flush /* --------------------------------------------- - * int console_ls_16550_flush(console_ls_16550_t *console) + * int console_ls_16550_flush(console_t *console) * Function to force a write of all buffered * data that hasn't been output. * In : x0 - pointer to console_t structure @@ -252,6 +252,6 @@ cmp x0, #0 ASM_ASSERT(ne) #endif /* ENABLE_ASSERTIONS */ - ldr x0, [x0, #CONSOLE_T_16550_BASE] + ldr x0, [x0, #CONSOLE_T_BASE] b console_ls_16550_core_flush endfunc console_ls_16550_flush diff --git a/plat/layerscape/common/include/ls_16550.h b/plat/layerscape/common/include/ls_16550.h index cb4514f..95a64ad 100644 --- a/plat/layerscape/common/include/ls_16550.h +++ b/plat/layerscape/common/include/ls_16550.h @@ -61,17 +61,10 @@ #define UARTLSR_OVRF (1 << 2) /* Rx Overrun Error */ #define UARTLSR_RDR (1 << 2) /* Rx Data Ready */ -#define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA - #ifndef __ASSEMBLER__ #include -typedef struct { - console_t console; - uintptr_t base; -} console_ls_16550_t; - /* * Initialize a new 16550 console instance and register it with the console * framework. The |console| pointer must point to storage that will be valid @@ -79,7 +72,7 @@ * Its contents will be reinitialized from scratch. */ int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, - console_ls_16550_t *console); + console_t *console); #endif /*__ASSEMBLER__*/ diff --git a/plat/layerscape/common/ls_bl1_setup.c b/plat/layerscape/common/ls_bl1_setup.c index fff065e..fa69be2 100644 --- a/plat/layerscape/common/ls_bl1_setup.c +++ b/plat/layerscape/common/ls_bl1_setup.c @@ -23,7 +23,7 @@ ******************************************************************************/ void ls_bl1_early_platform_setup(void) { - static console_ls_16550_t console; + static console_t console; #if !LS1043_DISABLE_TRUSTED_WDOG /* TODO: Enable watchdog */ diff --git a/plat/layerscape/common/ls_bl2_setup.c b/plat/layerscape/common/ls_bl2_setup.c index 35f42e1..6ca66bd 100644 --- a/plat/layerscape/common/ls_bl2_setup.c +++ b/plat/layerscape/common/ls_bl2_setup.c @@ -23,7 +23,7 @@ ******************************************************************************/ void ls_bl2_early_platform_setup(meminfo_t *mem_layout) { - static console_ls_16550_t console; + static console_t console; /* Initialize the console to provide early debug support */ console_ls_16550_register(LS_TF_UART_BASE, LS_TF_UART_CLOCK, diff --git a/plat/layerscape/common/ls_bl31_setup.c b/plat/layerscape/common/ls_bl31_setup.c index 03e5807..7a91aef 100644 --- a/plat/layerscape/common/ls_bl31_setup.c +++ b/plat/layerscape/common/ls_bl31_setup.c @@ -67,7 +67,7 @@ void ls_bl31_early_platform_setup(void *from_bl2, void *plat_params_from_bl2) { - static console_ls_16550_t console; + static console_t console; /* Initialize the console to provide early debug support */ console_ls_16550_register(LS_TF_UART_BASE, LS_TF_UART_CLOCK, @@ -182,7 +182,7 @@ ******************************************************************************/ void ls_bl31_plat_runtime_setup(void) { - static console_ls_16550_t console; + static console_t console; /* Initialize the runtime console */ console_ls_16550_register(PLAT_LS1043_UART_BASE, PLAT_LS1043_UART_CLOCK, diff --git a/plat/layerscape/common/tsp/ls_tsp_setup.c b/plat/layerscape/common/tsp/ls_tsp_setup.c index f3b6027..969d0b8 100644 --- a/plat/layerscape/common/tsp/ls_tsp_setup.c +++ b/plat/layerscape/common/tsp/ls_tsp_setup.c @@ -30,7 +30,7 @@ ******************************************************************************/ void ls_tsp_early_platform_setup(void) { - static console_ls_16550_t console; + static console_t console; /* * Initialize a different console than already in use to display * messages from TSP diff --git a/plat/nvidia/tegra/soc/t194/plat_setup.c b/plat/nvidia/tegra/soc/t194/plat_setup.c index 7f2b00d..b9d5dfe 100644 --- a/plat/nvidia/tegra/soc/t194/plat_setup.c +++ b/plat/nvidia/tegra/soc/t194/plat_setup.c @@ -170,7 +170,7 @@ console_clock, TEGRA_CONSOLE_BAUDRATE, &spe_console); - console_set_scope(&spe_console.console, CONSOLE_FLAG_BOOT | + console_set_scope(&spe_console, CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH); } #else @@ -190,7 +190,7 @@ console_clock, TEGRA_CONSOLE_BAUDRATE, &uart_console); - console_set_scope(&uart_console.console, CONSOLE_FLAG_BOOT | + console_set_scope(&uart_console, CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH); } #endif