aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorAchin Gupta <achin.gupta@arm.com>2014-02-09 13:47:08 +0000
committerDan Handley <dan.handley@arm.com>2014-02-20 19:06:34 +0000
commit8aa0cd43a8c4c59012eb26fad11abbd7359ea114 (patch)
tree5a161540711f61f2996fffc715b3dc978b2ea886 /plat
parenta0cd989dd589acaa6cddaa6617bd59dde0b8ce26 (diff)
downloadarm-trusted-firmware-8aa0cd43a8c4c59012eb26fad11abbd7359ea114.tar.gz
Specify address of UART device to use as a console
This patch adds the ability to specify the base address of a UART device for initialising the console. This allows a boot loader stage to use a different UART device from UART0 (default) for the console. Change-Id: Ie60b927389ae26085cfc90d22a564ff83ba62955
Diffstat (limited to 'plat')
-rw-r--r--plat/fvp/bl1_plat_setup.c2
-rw-r--r--plat/fvp/platform.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/plat/fvp/bl1_plat_setup.c b/plat/fvp/bl1_plat_setup.c
index 7a61c66..1cee705 100644
--- a/plat/fvp/bl1_plat_setup.c
+++ b/plat/fvp/bl1_plat_setup.c
@@ -116,7 +116,7 @@ void bl1_platform_setup(void)
mmio_write_32(SYS_CNTCTL_BASE + CNTCR_OFF, CNTCR_EN);
/* Initialize the console */
- console_init();
+ console_init(PL011_UART0_BASE);
return;
}
diff --git a/plat/fvp/platform.h b/plat/fvp/platform.h
index 6a8c988..375f595 100644
--- a/plat/fvp/platform.h
+++ b/plat/fvp/platform.h
@@ -299,7 +299,11 @@
/*******************************************************************************
* PL011 related constants
******************************************************************************/
-#define PL011_BASE 0x1c090000
+#define PL011_UART0_BASE 0x1c090000
+#define PL011_UART1_BASE 0x1c0a0000
+#define PL011_UART2_BASE 0x1c0b0000
+#define PL011_UART3_BASE 0x1c0c0000
+#define PL011_BASE PL011_UART0_BASE
/*******************************************************************************
* Declarations and constants to access the mailboxes safely. Each mailbox is