Skip to content

GitLab

Commit 98964f05 authored by Andre Przywara's avatar Andre Przywara
Browse files

16550: Use generic console_t data structure 



Since now the generic console_t structure holds the UART base address as
well, let's use that generic location and drop the UART driver specific
data structure at all.

Change-Id: I5c2fe3b6a667acf80c808cfec4a64059a2c9c25f
Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
parent d7873bcd
Hide whitespace changes
Inline Side-by-side
drivers/ti/uart/aarch32/16550_console.S
View file @ 98964f05
...@@ -91,7 +91,7 @@ endfunc console_16550_core_init ...@@ -91,7 +91,7 @@ endfunc console_16550_core_init
/* ------------------------------------------------------- /* -------------------------------------------------------
* int console_16550_register(uintptr_t baseaddr, * int console_16550_register(uintptr_t baseaddr,
* uint32_t clock, uint32_t baud, * uint32_t clock, uint32_t baud,
* console_16550_t *console); * console_t *console);
* Function to initialize and register a new 16550 * Function to initialize and register a new 16550
* console. Storage passed in for the console struct * console. Storage passed in for the console struct
* *must* be persistent (i.e. not from the stack). * *must* be persistent (i.e. not from the stack).
...@@ -101,7 +101,7 @@ endfunc console_16550_core_init ...@@ -101,7 +101,7 @@ endfunc console_16550_core_init
* In: r0 - UART register base address * In: r0 - UART register base address
* r1 - UART clock in Hz * r1 - UART clock in Hz
* r2 - Baud rate (ignored if r1 is 0) * r2 - Baud rate (ignored if r1 is 0)
* r3 - pointer to empty console_16550_t struct * r3 - pointer to empty console_t struct
* Out: return 1 on success, 0 on error * Out: return 1 on success, 0 on error
* Clobber list : r0, r1, r2 * Clobber list : r0, r1, r2
* ------------------------------------------------------- * -------------------------------------------------------
...@@ -111,7 +111,7 @@ func console_16550_register ...@@ -111,7 +111,7 @@ func console_16550_register
mov r4, r3 mov r4, r3
cmp r4, #0 cmp r4, #0
beq register_fail beq register_fail
str r0, [r4, #CONSOLE_T_16550_BASE] str r0, [r4, #CONSOLE_T_BASE]
/* A clock rate of zero means to skip the initialisation. */ /* A clock rate of zero means to skip the initialisation. */
cmp r1, #0 cmp r1, #0
...@@ -167,7 +167,7 @@ func console_16550_core_putc ...@@ -167,7 +167,7 @@ func console_16550_core_putc
endfunc console_16550_core_putc endfunc console_16550_core_putc
/* -------------------------------------------------------- /* --------------------------------------------------------
* int console_16550_putc(int c, console_16550_t *console) * int console_16550_putc(int c, console_t *console)
* Function to output a character over the console. It * Function to output a character over the console. It
* returns the character printed on success or -1 on error. * returns the character printed on success or -1 on error.
* In : r0 - character to be printed * In : r0 - character to be printed
...@@ -181,7 +181,7 @@ func console_16550_putc ...@@ -181,7 +181,7 @@ func console_16550_putc
cmp r1, #0 cmp r1, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr r1, [r1, #CONSOLE_T_16550_BASE] ldr r1, [r1, #CONSOLE_T_BASE]
b console_16550_core_putc b console_16550_core_putc
endfunc console_16550_putc endfunc console_16550_putc
...@@ -213,7 +213,7 @@ no_char: ...@@ -213,7 +213,7 @@ no_char:
endfunc console_16550_core_getc endfunc console_16550_core_getc
/* --------------------------------------------- /* ---------------------------------------------
* int console_16550_getc(console_16550_t *console) * int console_16550_getc(console_t *console)
* Function to get a character from the console. * Function to get a character from the console.
* It returns the character grabbed on success * It returns the character grabbed on success
* or -1 on if no character is available. * or -1 on if no character is available.
...@@ -227,7 +227,7 @@ func console_16550_getc ...@@ -227,7 +227,7 @@ func console_16550_getc
cmp r0, #0 cmp r0, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr r0, [r0, #CONSOLE_T_16550_BASE] ldr r0, [r0, #CONSOLE_T_BASE]
b console_16550_core_getc b console_16550_core_getc
endfunc console_16550_getc endfunc console_16550_getc
...@@ -257,7 +257,7 @@ func console_16550_core_flush ...@@ -257,7 +257,7 @@ func console_16550_core_flush
endfunc console_16550_core_flush endfunc console_16550_core_flush
/* --------------------------------------------- /* ---------------------------------------------
* int console_16550_flush(console_pl011_t *console) * int console_16550_flush(console_t *console)
* Function to force a write of all buffered * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* In : r0 - pointer to console_t structure * In : r0 - pointer to console_t structure
...@@ -270,6 +270,6 @@ func console_16550_flush ...@@ -270,6 +270,6 @@ func console_16550_flush
cmp r0, #0 cmp r0, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr r0, [r0, #CONSOLE_T_16550_BASE] ldr r0, [r0, #CONSOLE_T_BASE]
b console_16550_core_flush b console_16550_core_flush
endfunc console_16550_flush endfunc console_16550_flush
drivers/ti/uart/aarch64/16550_console.S
View file @ 98964f05
...@@ -88,7 +88,7 @@ endfunc console_16550_core_init ...@@ -88,7 +88,7 @@ endfunc console_16550_core_init
/* ----------------------------------------------- /* -----------------------------------------------
* int console_16550_register(uintptr_t baseaddr, * int console_16550_register(uintptr_t baseaddr,
* uint32_t clock, uint32_t baud, * uint32_t clock, uint32_t baud,
* console_16550_t *console); * console_t *console);
* Function to initialize and register a new 16550 * Function to initialize and register a new 16550
* console. Storage passed in for the console struct * console. Storage passed in for the console struct
* *must* be persistent (i.e. not from the stack). * *must* be persistent (i.e. not from the stack).
...@@ -98,7 +98,7 @@ endfunc console_16550_core_init ...@@ -98,7 +98,7 @@ endfunc console_16550_core_init
* In: x0 - UART register base address * In: x0 - UART register base address
* w1 - UART clock in Hz * w1 - UART clock in Hz
* w2 - Baud rate (ignored if w1 is 0) * w2 - Baud rate (ignored if w1 is 0)
* x3 - pointer to empty console_16550_t struct * x3 - pointer to empty console_t struct
* Out: return 1 on success, 0 on error * Out: return 1 on success, 0 on error
* Clobber list : x0, x1, x2, x6, x7, x14 * Clobber list : x0, x1, x2, x6, x7, x14
* ----------------------------------------------- * -----------------------------------------------
...@@ -107,7 +107,7 @@ func console_16550_register ...@@ -107,7 +107,7 @@ func console_16550_register
mov x7, x30 mov x7, x30
mov x6, x3 mov x6, x3
cbz x6, register_fail cbz x6, register_fail
str x0, [x6, #CONSOLE_T_16550_BASE] str x0, [x6, #CONSOLE_T_BASE]
/* A clock rate of zero means to skip the initialisation. */ /* A clock rate of zero means to skip the initialisation. */
cbz w1, register_16550 cbz w1, register_16550
...@@ -161,7 +161,7 @@ func console_16550_core_putc ...@@ -161,7 +161,7 @@ func console_16550_core_putc
endfunc console_16550_core_putc endfunc console_16550_core_putc
/* -------------------------------------------------------- /* --------------------------------------------------------
* int console_16550_putc(int c, console_16550_t *console) * int console_16550_putc(int c, console_t *console)
* Function to output a character over the console. It * Function to output a character over the console. It
* returns the character printed on success or -1 on error. * returns the character printed on success or -1 on error.
* In : w0 - character to be printed * In : w0 - character to be printed
...@@ -175,7 +175,7 @@ func console_16550_putc ...@@ -175,7 +175,7 @@ func console_16550_putc
cmp x1, #0 cmp x1, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x1, [x1, #CONSOLE_T_16550_BASE] ldr x1, [x1, #CONSOLE_T_BASE]
b console_16550_core_putc b console_16550_core_putc
endfunc console_16550_putc endfunc console_16550_putc
...@@ -206,7 +206,7 @@ no_char: ...@@ -206,7 +206,7 @@ no_char:
endfunc console_16550_core_getc endfunc console_16550_core_getc
/* --------------------------------------------- /* ---------------------------------------------
* int console_16550_getc(console_16550_t *console) * int console_16550_getc(console_t *console)
* Function to get a character from the console. * Function to get a character from the console.
* It returns the character grabbed on success * It returns the character grabbed on success
* or -1 on if no character is available. * or -1 on if no character is available.
...@@ -220,7 +220,7 @@ func console_16550_getc ...@@ -220,7 +220,7 @@ func console_16550_getc
cmp x1, #0 cmp x1, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x0, [x0, #CONSOLE_T_16550_BASE] ldr x0, [x0, #CONSOLE_T_BASE]
b console_16550_core_getc b console_16550_core_getc
endfunc console_16550_getc endfunc console_16550_getc
...@@ -250,7 +250,7 @@ func console_16550_core_flush ...@@ -250,7 +250,7 @@ func console_16550_core_flush
endfunc console_16550_core_flush endfunc console_16550_core_flush
/* --------------------------------------------- /* ---------------------------------------------
* int console_16550_flush(console_pl011_t *console) * int console_16550_flush(console_t *console)
* Function to force a write of all buffered * Function to force a write of all buffered
* data that hasn't been output. * data that hasn't been output.
* In : x0 - pointer to console_t structure * In : x0 - pointer to console_t structure
...@@ -263,6 +263,6 @@ func console_16550_flush ...@@ -263,6 +263,6 @@ func console_16550_flush
cmp x0, #0 cmp x0, #0
ASM_ASSERT(ne) ASM_ASSERT(ne)
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
ldr x0, [x0, #CONSOLE_T_16550_BASE] ldr x0, [x0, #CONSOLE_T_BASE]
b console_16550_core_flush b console_16550_core_flush
endfunc console_16550_flush endfunc console_16550_flush
include/drivers/ti/uart/uart_16550.h
View file @ 98964f05
...@@ -71,17 +71,10 @@ ...@@ -71,17 +71,10 @@
#define UARTLSR_RDR_BIT (0) /* Rx Data Ready Bit */ #define UARTLSR_RDR_BIT (0) /* Rx Data Ready Bit */
#define UARTLSR_RDR (1 << UARTLSR_RDR_BIT) /* Rx Data Ready */ #define UARTLSR_RDR (1 << UARTLSR_RDR_BIT) /* Rx Data Ready */
#define CONSOLE_T_16550_BASE CONSOLE_T_DRVDATA
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
#include <stdint.h> #include <stdint.h>
typedef struct {
console_t console;
uintptr_t base;
} console_16550_t;
/* /*
* Initialize a new 16550 console instance and register it with the console * Initialize a new 16550 console instance and register it with the console
* framework. The |console| pointer must point to storage that will be valid * framework. The |console| pointer must point to storage that will be valid
...@@ -94,7 +87,7 @@ typedef struct { ...@@ -94,7 +87,7 @@ typedef struct {
* case as well. * case as well.
*/ */
int console_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, int console_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
console_16550_t *console); console_t *console);
#endif /*__ASSEMBLER__*/ #endif /*__ASSEMBLER__*/
......
plat/allwinner/common/sunxi_bl31_setup.c
View file @ 98964f05
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
static entry_point_info_t bl32_image_ep_info; static entry_point_info_t bl32_image_ep_info;
static entry_point_info_t bl33_image_ep_info; static entry_point_info_t bl33_image_ep_info;
static console_16550_t console; static console_t console;
static const gicv2_driver_data_t sunxi_gic_data = { static const gicv2_driver_data_t sunxi_gic_data = {
.gicd_base = SUNXI_GICD_BASE, .gicd_base = SUNXI_GICD_BASE,
......
plat/intel/soc/agilex/bl2_plat_setup.c
View file @ 98964f05
...@@ -51,7 +51,7 @@ boot_source_type boot_source = BOOT_SOURCE; ...@@ -51,7 +51,7 @@ boot_source_type boot_source = BOOT_SOURCE;
void bl2_el3_early_platform_setup(u_register_t x0, u_register_t x1, void bl2_el3_early_platform_setup(u_register_t x0, u_register_t x1,
u_register_t x2, u_register_t x4) u_register_t x2, u_register_t x4)
{ {
static console_16550_t console; static console_t console;
handoff reverse_handoff_ptr; handoff reverse_handoff_ptr;
generic_delay_timer_init(); generic_delay_timer_init();
......
plat/intel/soc/agilex/bl31_plat_setup.c
View file @ 98964f05
...@@ -37,7 +37,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) ...@@ -37,7 +37,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3) u_register_t arg2, u_register_t arg3)
{ {
static console_16550_t console; static console_t console;
console_16550_register(PLAT_UART0_BASE, PLAT_UART_CLOCK, PLAT_BAUDRATE, console_16550_register(PLAT_UART0_BASE, PLAT_UART_CLOCK, PLAT_BAUDRATE,
&console); &console);
......
plat/intel/soc/stratix10/bl2_plat_setup.c
View file @ 98964f05
...@@ -50,7 +50,7 @@ boot_source_type boot_source = BOOT_SOURCE; ...@@ -50,7 +50,7 @@ boot_source_type boot_source = BOOT_SOURCE;
void bl2_el3_early_platform_setup(u_register_t x0, u_register_t x1, void bl2_el3_early_platform_setup(u_register_t x0, u_register_t x1,
u_register_t x2, u_register_t x4) u_register_t x2, u_register_t x4)
{ {
static console_16550_t console; static console_t console;
handoff reverse_handoff_ptr; handoff reverse_handoff_ptr;
generic_delay_timer_init(); generic_delay_timer_init();
......
plat/intel/soc/stratix10/bl31_plat_setup.c
View file @ 98964f05
...@@ -45,7 +45,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) ...@@ -45,7 +45,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3) u_register_t arg2, u_register_t arg3)
{ {
static console_16550_t console; static console_t console;
console_16550_register(PLAT_UART0_BASE, PLAT_UART_CLOCK, PLAT_BAUDRATE, console_16550_register(PLAT_UART0_BASE, PLAT_UART_CLOCK, PLAT_BAUDRATE,
&console); &console);
......
plat/marvell/common/marvell_console.c
View file @ 98964f05
...@@ -20,8 +20,8 @@ static console_a3700_t marvell_runtime_console; ...@@ -20,8 +20,8 @@ static console_a3700_t marvell_runtime_console;
#else #else
#include <drivers/ti/uart/uart_16550.h> #include <drivers/ti/uart/uart_16550.h>
static console_16550_t marvell_boot_console; static console_t marvell_boot_console;
static console_16550_t marvell_runtime_console; static console_t marvell_runtime_console;
#endif #endif
/******************************************************************************* /*******************************************************************************
...@@ -50,15 +50,14 @@ void marvell_console_boot_init(void) ...@@ -50,15 +50,14 @@ void marvell_console_boot_init(void)
panic(); panic();
} }
console_set_scope(&marvell_boot_console.console, console_set_scope(&marvell_boot_console, CONSOLE_FLAG_BOOT);
CONSOLE_FLAG_BOOT);
} }
void marvell_console_boot_end(void) void marvell_console_boot_end(void)
{ {
(void)console_flush(); (void)console_flush();
(void)console_unregister(&marvell_boot_console.console); (void)console_unregister(&marvell_boot_console);
} }
/* Initialize the runtime console */ /* Initialize the runtime console */
...@@ -77,13 +76,12 @@ void marvell_console_runtime_init(void) ...@@ -77,13 +76,12 @@ void marvell_console_runtime_init(void)
if (rc == 0) if (rc == 0)
panic(); panic();
console_set_scope(&marvell_runtime_console.console, console_set_scope(&marvell_runtime_console, CONSOLE_FLAG_RUNTIME);
CONSOLE_FLAG_RUNTIME);
} }
void marvell_console_runtime_end(void) void marvell_console_runtime_end(void)
{ {
(void)console_flush(); (void)console_flush();
(void)console_unregister(&marvell_runtime_console.console); (void)console_unregister(&marvell_runtime_console);
} }
plat/mediatek/mt8173/bl31_plat_setup.c
View file @ 98964f05
...@@ -100,7 +100,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) ...@@ -100,7 +100,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3) u_register_t arg2, u_register_t arg3)
{ {
static console_16550_t console; static console_t console;
console_16550_register(MT8173_UART0_BASE, MT8173_UART_CLOCK, MT8173_BAUDRATE, &console); console_16550_register(MT8173_UART0_BASE, MT8173_UART_CLOCK, MT8173_BAUDRATE, &console);
......
plat/mediatek/mt8183/bl31_plat_setup.c
View file @ 98964f05
...@@ -112,7 +112,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) ...@@ -112,7 +112,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3) u_register_t arg2, u_register_t arg3)
{ {
static console_16550_t console; static console_t console;
params_early_setup(arg1); params_early_setup(arg1);
......
plat/nvidia/tegra/soc/t132/plat_setup.c
View file @ 98964f05
...@@ -92,7 +92,7 @@ static uint32_t tegra132_uart_addresses[TEGRA132_MAX_UART_PORTS + 1] = { ...@@ -92,7 +92,7 @@ static uint32_t tegra132_uart_addresses[TEGRA132_MAX_UART_PORTS + 1] = {
******************************************************************************/ ******************************************************************************/
void plat_enable_console(int32_t id) void plat_enable_console(int32_t id)
{ {
static console_16550_t uart_console; static console_t uart_console;
uint32_t console_clock; uint32_t console_clock;
if ((id > 0) && (id < TEGRA132_MAX_UART_PORTS)) { if ((id > 0) && (id < TEGRA132_MAX_UART_PORTS)) {
...@@ -109,7 +109,7 @@ void plat_enable_console(int32_t id) ...@@ -109,7 +109,7 @@ void plat_enable_console(int32_t id)
console_clock, console_clock,
TEGRA_CONSOLE_BAUDRATE, TEGRA_CONSOLE_BAUDRATE,
&uart_console); &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); CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH);
} }
} }
......
plat/nvidia/tegra/soc/t186/plat_setup.c
View file @ 98964f05
...@@ -150,7 +150,7 @@ static uint32_t tegra186_uart_addresses[TEGRA186_MAX_UART_PORTS + 1] = { ...@@ -150,7 +150,7 @@ static uint32_t tegra186_uart_addresses[TEGRA186_MAX_UART_PORTS + 1] = {
******************************************************************************/ ******************************************************************************/
void plat_enable_console(int32_t id) void plat_enable_console(int32_t id)
{ {
static console_16550_t uart_console; static console_t uart_console;
uint32_t console_clock; uint32_t console_clock;
if ((id > 0) && (id < TEGRA186_MAX_UART_PORTS)) { if ((id > 0) && (id < TEGRA186_MAX_UART_PORTS)) {
...@@ -167,7 +167,7 @@ void plat_enable_console(int32_t id) ...@@ -167,7 +167,7 @@ void plat_enable_console(int32_t id)
console_clock, console_clock,
TEGRA_CONSOLE_BAUDRATE, TEGRA_CONSOLE_BAUDRATE,
&uart_console); &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); CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH);
} }
} }
......
plat/nvidia/tegra/soc/t194/plat_setup.c
View file @ 98964f05
...@@ -174,7 +174,7 @@ void plat_enable_console(int32_t id) ...@@ -174,7 +174,7 @@ void plat_enable_console(int32_t id)
CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH); CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH);
} }
#else #else
static console_16550_t uart_console; static console_t uart_console;
if ((id > 0) && (id < TEGRA194_MAX_UART_PORTS)) { if ((id > 0) && (id < TEGRA194_MAX_UART_PORTS)) {
/* /*
......
plat/nvidia/tegra/soc/t210/plat_setup.c
View file @ 98964f05
...@@ -119,7 +119,7 @@ static uint32_t tegra210_uart_addresses[TEGRA210_MAX_UART_PORTS + 1] = { ...@@ -119,7 +119,7 @@ static uint32_t tegra210_uart_addresses[TEGRA210_MAX_UART_PORTS + 1] = {
******************************************************************************/ ******************************************************************************/
void plat_enable_console(int32_t id) void plat_enable_console(int32_t id)
{ {
static console_16550_t uart_console; static console_t uart_console;
uint32_t console_clock; uint32_t console_clock;
if ((id > 0) && (id < TEGRA210_MAX_UART_PORTS)) { if ((id > 0) && (id < TEGRA210_MAX_UART_PORTS)) {
...@@ -136,7 +136,7 @@ void plat_enable_console(int32_t id) ...@@ -136,7 +136,7 @@ void plat_enable_console(int32_t id)
console_clock, console_clock,
TEGRA_CONSOLE_BAUDRATE, TEGRA_CONSOLE_BAUDRATE,
&uart_console); &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); CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_CRASH);
} }
} }
......
plat/rockchip/common/bl31_plat_setup.c
View file @ 98964f05
...@@ -57,7 +57,7 @@ void params_early_setup(u_register_t plat_param_from_bl2) ...@@ -57,7 +57,7 @@ void params_early_setup(u_register_t plat_param_from_bl2)
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3) u_register_t arg2, u_register_t arg3)
{ {
static console_16550_t console; static console_t console;
params_early_setup(arg1); params_early_setup(arg1);
......
plat/rockchip/common/sp_min_plat_setup.c
View file @ 98964f05
...@@ -52,7 +52,7 @@ unsigned int plat_is_my_cpu_primary(void); ...@@ -52,7 +52,7 @@ unsigned int plat_is_my_cpu_primary(void);
void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3) u_register_t arg2, u_register_t arg3)
{ {
static console_16550_t console; static console_t console;
params_early_setup(arg1); params_early_setup(arg1);
......
plat/rpi/common/rpi3_common.c
View file @ 98964f05
...@@ -102,7 +102,7 @@ static const mmap_region_t plat_rpi3_mmap[] = { ...@@ -102,7 +102,7 @@ static const mmap_region_t plat_rpi3_mmap[] = {
/******************************************************************************* /*******************************************************************************
* Function that sets up the console * Function that sets up the console
******************************************************************************/ ******************************************************************************/
static console_16550_t rpi3_console; static console_t rpi3_console;
void rpi3_console_init(unsigned int base_clk_rate) void rpi3_console_init(unsigned int base_clk_rate)
{ {
...@@ -123,7 +123,7 @@ void rpi3_console_init(unsigned int base_clk_rate) ...@@ -123,7 +123,7 @@ void rpi3_console_init(unsigned int base_clk_rate)
panic(); panic();
} }
console_set_scope(&rpi3_console.console, console_scope); console_set_scope(&rpi3_console, console_scope);
} }
/******************************************************************************* /*******************************************************************************
......
plat/ti/k3/common/k3_console.c
View file @ 98964f05
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
void bl31_console_setup(void) void bl31_console_setup(void)
{ {
static console_16550_t console; static console_t console;
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
console_16550_register(K3_USART_BASE, K3_USART_CLK_SPEED, console_16550_register(K3_USART_BASE, K3_USART_CLK_SPEED,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment