diff options
| author | Vikram Kanigiri <vikram.kanigiri@arm.com> | 2014-03-25 17:35:26 +0000 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-03-26 17:36:36 +0000 |
| commit | 0796fe01f8a596d4fad84c228cb5f01117b4029e (patch) | |
| tree | 80d1bac690c19ef48eb49faf5eead43a85795ad5 /plat | |
| parent | c1df3be7dd61fcc6ff31c4ff0ecc1e822fc5d573 (diff) | |
| download | arm-trusted-firmware-0796fe01f8a596d4fad84c228cb5f01117b4029e.tar.gz | |
Initialise UART console in all bootloader stages
This patch reworks the console driver to ensure that each bootloader stage
initializes it independently. As a result, both BL3-1 and BL2 platform code
now calls console_init() instead of relying on BL1 to perform console setup
Fixes ARM-software/tf-issues#120
Change-Id: Ic4d66e0375e40a2fc7434afcabc8bbb4715c14ab
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/fvp/bl2_plat_setup.c | 3 | ||||
| -rw-r--r-- | plat/fvp/bl31_plat_setup.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/plat/fvp/bl2_plat_setup.c b/plat/fvp/bl2_plat_setup.c index f0d6e44..4d57ed5 100644 --- a/plat/fvp/bl2_plat_setup.c +++ b/plat/fvp/bl2_plat_setup.c @@ -33,6 +33,7 @@ #include <platform.h> #include <bl2.h> #include <bl_common.h> +#include <console.h> /******************************************************************************* * Declarations of linker defined symbols which will help us find the layout @@ -110,6 +111,8 @@ void bl2_early_platform_setup(meminfo *mem_layout, /* Initialize the platform config for future decision making */ platform_config_setup(); + console_init(PL011_UART0_BASE); + return; } diff --git a/plat/fvp/bl31_plat_setup.c b/plat/fvp/bl31_plat_setup.c index 1b24687..eb137e0 100644 --- a/plat/fvp/bl31_plat_setup.c +++ b/plat/fvp/bl31_plat_setup.c @@ -32,6 +32,7 @@ #include <fvp_pwrc.h> #include <assert.h> #include <arch_helpers.h> +#include <console.h> /******************************************************************************* * Declarations of linker defined symbols which will help us find the layout @@ -117,6 +118,8 @@ void bl31_early_platform_setup(bl31_args *from_bl2, /* Initialize the platform config for future decision making */ platform_config_setup(); + + console_init(PL011_UART0_BASE); } /******************************************************************************* |