diff options
| author | Vincent Guittot <vincent.guittot@linaro.org> | 2023-11-28 15:49:54 +0100 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2023-11-30 08:49:34 +0100 |
| commit | ab52804106dfca1783698e127ea43606f6d01a2f (patch) | |
| tree | 451e7e1ea36de0389a21cc4c47f4699b18082e55 | |
| parent | 6d8721db1753e0b9fc4252308186d5eb152252a8 (diff) | |
Remove uart2 from cactus primary partition
It will be used by SCMI server partition.
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
| -rw-r--r-- | spm/cactus/cactus_main.c | 7 | ||||
| -rw-r--r-- | spm/cactus/plat/arm/fvp/fdts/cactus.dts | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/spm/cactus/cactus_main.c b/spm/cactus/cactus_main.c index 50219f3..9d40caf 100644 --- a/spm/cactus/cactus_main.c +++ b/spm/cactus/cactus_main.c @@ -286,14 +286,17 @@ void __dead2 cactus_main(bool primary_cold_boot, goto msg_loop; } - if (ffa_id == SPM_VM_ID_FIRST) { + if (ffa_id == (SPM_VM_ID_FIRST)) { + cactus_print_boot_info(boot_info_header); + } + + if (ffa_id == (SPM_VM_ID_FIRST + 2)) { 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); } diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus.dts b/spm/cactus/plat/arm/fvp/fdts/cactus.dts index 4d27c9c..edeb65c 100644 --- a/spm/cactus/plat/arm/fvp/fdts/cactus.dts +++ b/spm/cactus/plat/arm/fvp/fdts/cactus.dts @@ -93,12 +93,6 @@ device-regions { compatible = "arm,ffa-manifest-device-regions"; - uart2 { - base-address = <0x00000000 0x1c0b0000>; - pages-count = <1>; - attributes = <0x3>; /* read-write */ - }; - smmuv3-testengine { /* * SMMUv3TestEngine is a DMA IP modeled in the |