refactor: first cactus SP to drop uart
The first cactus SP was using a uart device to
serve as a validation for the device memory regions.
Currently, there are other uses that serve this test.
As such dropping the uart device from the manifest, and
configuring SPs to always use FFA_CONSOLE_LOG.
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I0ee35bfca7a885f5adc112964edeb627bb659fc0
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c
index 19a89f5..be6baa9 100644
--- a/spm/cactus/cactus_main.c
+++ b/spm/cactus/cactus_main.c
@@ -286,22 +286,16 @@
goto msg_loop;
}
- if (ffa_id == SPM_VM_ID_FIRST) {
- console_init(CACTUS_PL011_UART_BASE,
- CACTUS_PL011_UART_CLK_IN_HZ,
- PL011_BAUDRATE);
-
- set_putc_impl(PL011_AS_STDOUT);
-
- cactus_print_boot_info(boot_info_header);
- } else {
- set_putc_impl(FFA_SVC_SMC_CALL_AS_STDOUT);
- }
+ set_putc_impl(FFA_SVC_SMC_CALL_AS_STDOUT);
/* Below string is monitored by CI expect script. */
NOTICE("Booting Secure Partition (ID: %x)\n%s\n%s\n",
ffa_id, build_message, version_string);
+ if (ffa_id == SP_ID(1)) {
+ cactus_print_boot_info(boot_info_header);
+ }
+
if (ffa_id == (SPM_VM_ID_FIRST + 2)) {
VERBOSE("Mapping RXTX Region\n");
CONFIGURE_AND_MAP_MAILBOX(mb, PAGE_SIZE, ret);