commit 0c3a76a2e181e80e8f6392a13373f865080bcf5d
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Thu Nov 30 20:20:55 2023 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Thu Nov 30 20:20:55 2023 +0100
tree a294dca990cada0b1954e52484e42ec98c734e40
parent fb1dd16f1ff373ca044c14fadb71eaad2409c412
parent 8b9af0980156bf16674a112bfbea587040e64576

Merge "feat(fvp): add stdout-path" into integration

fdts/fvp-base-psci-common.dtsi

diff --git a/fdts/fvp-base-psci-common.dtsi b/fdts/fvp-base-psci-common.dtsi
index 79cf37d..ff31ba7 100644
--- a/fdts/fvp-base-psci-common.dtsi
+++ b/fdts/fvp-base-psci-common.dtsi
@@ -27,11 +27,12 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
+	chosen {
+		stdout-path = "serial0:115200n8";
 #if (ENABLE_RME == 1)
-	chosen { bootargs = "console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=on";};
-#else
-	chosen {};
+		bootargs = "console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=on";
 #endif
+	};
 
 	aliases {
 		serial0 = &v2m_serial0;