| commit | 64d7387398000a5c2a78af7d713c53f9d46507f3 | [log] [tgz] |
|---|---|---|
| author | Joanna Farley <joanna.farley@arm.com> | Mon Nov 06 14:55:07 2023 +0100 |
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | Mon Nov 06 14:55:07 2023 +0100 |
| tree | 0e30c58fc520b9d3e41cf421b3dabbce055b0866 | |
| parent | a1d22e793471034719b5e1a853ca2bf9c8f07a86 [diff] | |
| parent | 3da80c85885dca05f5278bc3fb396bfc1c6fb418 [diff] |
Merge "feat(xilinx): switch boot console to runtime" into integration
diff --git a/plat/xilinx/versal/bl31_versal_setup.c b/plat/xilinx/versal/bl31_versal_setup.c index 96a8e3c..cd105c6 100644 --- a/plat/xilinx/versal/bl31_versal_setup.c +++ b/plat/xilinx/versal/bl31_versal_setup.c
@@ -203,6 +203,8 @@ if (rc != 0) { panic(); } + + console_switch_state(CONSOLE_FLAG_RUNTIME); } /*
diff --git a/plat/xilinx/versal_net/bl31_versal_net_setup.c b/plat/xilinx/versal_net/bl31_versal_net_setup.c index 5c5c697..56ef27b 100644 --- a/plat/xilinx/versal_net/bl31_versal_net_setup.c +++ b/plat/xilinx/versal_net/bl31_versal_net_setup.c
@@ -226,6 +226,8 @@ if (rc != 0) { panic(); } + + console_switch_state(CONSOLE_FLAG_RUNTIME); } /*
diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index aed1519..baf6717 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c
@@ -190,6 +190,8 @@ #endif custom_runtime_setup(); + + console_switch_state(CONSOLE_FLAG_RUNTIME); } /*