cactus: Use UART2 instead of UART0
It isn't a good idea to share resources between different images. For
this reason, Cactus should use a different console than the TF and TFTF.
Future partitions should ideally use another different UART.
Change-Id: I8b61ca09b0e820bc6b9cdb400c8d55e2005a23bd
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
diff --git a/plat/arm/board/fvp/fvp_def.h b/plat/arm/board/fvp/fvp_def.h
index a47287f..46323e4 100644
--- a/plat/arm/board/fvp/fvp_def.h
+++ b/plat/arm/board/fvp/fvp_def.h
@@ -44,7 +44,14 @@
* PL011 related constants
******************************************************************************/
#define PL011_UART0_BASE 0x1c090000
+#define PL011_UART1_BASE 0x1c0a0000
+#define PL011_UART2_BASE 0x1c0b0000
+#define PL011_UART3_BASE 0x1c0c0000
+
#define PL011_UART0_CLK_IN_HZ 24000000
+#define PL011_UART1_CLK_IN_HZ 24000000
+#define PL011_UART2_CLK_IN_HZ 24000000
+#define PL011_UART3_CLK_IN_HZ 24000000
#define PLAT_ARM_UART_BASE PL011_UART0_BASE
#define PLAT_ARM_UART_CLK_IN_HZ PL011_UART0_CLK_IN_HZ
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index 45197d3..4f0d1ae 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -77,8 +77,8 @@
void __dead2 cactus_main(void *el3_el0_buffer, size_t el3_el0_buffer_size)
{
- console_init(PLAT_ARM_UART_BASE,
- PLAT_ARM_UART_CLK_IN_HZ,
+ console_init(PL011_UART2_BASE,
+ PL011_UART2_CLK_IN_HZ,
PL011_BAUDRATE);
NOTICE("Booting test Secure Partition Cactus\n");