diff options
| author | danh-arm <dan.handley@arm.com> | 2014-08-21 16:44:40 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-08-21 16:44:40 +0100 |
| commit | 4ed74d02e03e982377b0c161c51edbca73593786 (patch) | |
| tree | 173315ffb49b9727d3cc27976378956245ee30c2 | |
| parent | e434cf1aa3548e943d43a5ae72b65fd9d9633b84 (diff) | |
| parent | 12d554f9418670f544b2bc60ebf6ca6f46ec88c3 (diff) | |
Merge pull request #197 from soby-mathew/rationalize_uarts
Rationalize UART usage among different BL stages
| -rw-r--r-- | plat/fvp/tsp/tsp_fvp_setup.c | 2 | ||||
| -rw-r--r-- | plat/juno/bl1_plat_setup.c | 2 | ||||
| -rw-r--r-- | plat/juno/bl2_plat_setup.c | 2 | ||||
| -rw-r--r-- | plat/juno/bl31_plat_setup.c | 2 | ||||
| -rw-r--r-- | plat/juno/juno_def.h | 2 | ||||
| -rw-r--r-- | plat/juno/tsp/tsp_plat_setup.c | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/plat/fvp/tsp/tsp_fvp_setup.c b/plat/fvp/tsp/tsp_fvp_setup.c index ae63a7d..301f669 100644 --- a/plat/fvp/tsp/tsp_fvp_setup.c +++ b/plat/fvp/tsp/tsp_fvp_setup.c @@ -72,7 +72,7 @@ void tsp_early_platform_setup(void) * Initialize a different console than already in use to display * 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 */ fvp_config_setup(); diff --git a/plat/juno/bl1_plat_setup.c b/plat/juno/bl1_plat_setup.c index d2f2ab4..5804682 100644 --- a/plat/juno/bl1_plat_setup.c +++ b/plat/juno/bl1_plat_setup.c @@ -75,7 +75,7 @@ void bl1_early_platform_setup(void) const size_t bl1_size = BL1_RAM_LIMIT - BL1_RAM_BASE; /* 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 diff --git a/plat/juno/bl2_plat_setup.c b/plat/juno/bl2_plat_setup.c index 5dec2d7..717cfbb 100644 --- a/plat/juno/bl2_plat_setup.c +++ b/plat/juno/bl2_plat_setup.c @@ -158,7 +158,7 @@ struct entry_point_info *bl2_plat_get_bl31_ep_info(void) void bl2_early_platform_setup(meminfo_t *mem_layout) { /* 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 */ bl2_tzram_layout = *mem_layout; diff --git a/plat/juno/bl31_plat_setup.c b/plat/juno/bl31_plat_setup.c index 131a1b1..4a92d44 100644 --- a/plat/juno/bl31_plat_setup.c +++ b/plat/juno/bl31_plat_setup.c @@ -108,7 +108,7 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2, void *plat_params_from_bl2) { /* 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 diff --git a/plat/juno/juno_def.h b/plat/juno/juno_def.h index 1eae65d..15296ed 100644 --- a/plat/juno/juno_def.h +++ b/plat/juno/juno_def.h @@ -138,6 +138,8 @@ #define PL011_UART0_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 diff --git a/plat/juno/tsp/tsp_plat_setup.c b/plat/juno/tsp/tsp_plat_setup.c index b999df1..2d4ab81 100644 --- a/plat/juno/tsp/tsp_plat_setup.c +++ b/plat/juno/tsp/tsp_plat_setup.c @@ -72,7 +72,7 @@ void tsp_early_platform_setup(void) * Initialize a different console than already in use to display * 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); } /******************************************************************************* |