Commit 4ed74d02 authored by danh-arm's avatar danh-arm
Browse files

Merge pull request #197 from soby-mathew/rationalize_uarts

Rationalize UART usage among different BL stages
parents e434cf1a 12d554f9
...@@ -72,7 +72,7 @@ void tsp_early_platform_setup(void) ...@@ -72,7 +72,7 @@ void tsp_early_platform_setup(void)
* Initialize a different console than already in use to display * Initialize a different console than already in use to display
* messages from TSP * messages from TSP
*/ */
console_init(PL011_UART1_BASE, PL011_UART1_CLK_IN_HZ, PL011_BAUDRATE); console_init(PL011_UART2_BASE, PL011_UART2_CLK_IN_HZ, PL011_BAUDRATE);
/* Initialize the platform config for future decision making */ /* Initialize the platform config for future decision making */
fvp_config_setup(); fvp_config_setup();
......
...@@ -75,7 +75,7 @@ void bl1_early_platform_setup(void) ...@@ -75,7 +75,7 @@ void bl1_early_platform_setup(void)
const size_t bl1_size = BL1_RAM_LIMIT - BL1_RAM_BASE; const size_t bl1_size = BL1_RAM_LIMIT - BL1_RAM_BASE;
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
console_init(PL011_UART0_BASE, PL011_UART0_CLK_IN_HZ, PL011_BAUDRATE); console_init(PL011_UART2_BASE, PL011_UART2_CLK_IN_HZ, PL011_BAUDRATE);
/* /*
* Enable CCI-400 for this cluster. No need for locks as no other cpu is * Enable CCI-400 for this cluster. No need for locks as no other cpu is
......
...@@ -158,7 +158,7 @@ struct entry_point_info *bl2_plat_get_bl31_ep_info(void) ...@@ -158,7 +158,7 @@ struct entry_point_info *bl2_plat_get_bl31_ep_info(void)
void bl2_early_platform_setup(meminfo_t *mem_layout) void bl2_early_platform_setup(meminfo_t *mem_layout)
{ {
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
console_init(PL011_UART0_BASE, PL011_UART0_CLK_IN_HZ, PL011_BAUDRATE); console_init(PL011_UART2_BASE, PL011_UART2_CLK_IN_HZ, PL011_BAUDRATE);
/* Setup the BL2 memory layout */ /* Setup the BL2 memory layout */
bl2_tzram_layout = *mem_layout; bl2_tzram_layout = *mem_layout;
......
...@@ -108,7 +108,7 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2, ...@@ -108,7 +108,7 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
void *plat_params_from_bl2) void *plat_params_from_bl2)
{ {
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
console_init(PL011_UART0_BASE, PL011_UART0_CLK_IN_HZ, PL011_BAUDRATE); console_init(PL011_UART2_BASE, PL011_UART2_CLK_IN_HZ, PL011_BAUDRATE);
/* /*
* Initialise the CCI-400 driver for BL31 so that it is accessible after * Initialise the CCI-400 driver for BL31 so that it is accessible after
......
...@@ -138,6 +138,8 @@ ...@@ -138,6 +138,8 @@
#define PL011_UART0_CLK_IN_HZ 24000000 #define PL011_UART0_CLK_IN_HZ 24000000
#define PL011_UART1_CLK_IN_HZ 24000000 #define PL011_UART1_CLK_IN_HZ 24000000
#define PL011_UART2_CLK_IN_HZ 7273800
#define PL011_UART3_CLK_IN_HZ 7273800
/******************************************************************************* /*******************************************************************************
* NIC-400 related constants * NIC-400 related constants
......
...@@ -72,7 +72,7 @@ void tsp_early_platform_setup(void) ...@@ -72,7 +72,7 @@ void tsp_early_platform_setup(void)
* Initialize a different console than already in use to display * Initialize a different console than already in use to display
* messages from TSP * messages from TSP
*/ */
console_init(PL011_UART1_BASE, PL011_UART1_CLK_IN_HZ, PL011_BAUDRATE); console_init(PL011_UART0_BASE, PL011_UART0_CLK_IN_HZ, PL011_BAUDRATE);
} }
/******************************************************************************* /*******************************************************************************
......
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