ArmPlatformPkg/Bds: Early Console Initialization

Setup the EFI System Table with information about the
Console Devices early, so that error messages in bds
are printed on the console earlier.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPlatformPkg/Bds/Bds.c b/ArmPlatformPkg/Bds/Bds.c
index 3ee866c9f2f53808f1a81793071b93e792c3e915..4cea3cd531bbdc46e95625b4abe281d3dbc6168b 100644 (file)
--- a/ArmPlatformPkg/Bds/Bds.c
+++ b/ArmPlatformPkg/Bds/Bds.c
@@ -479,6 +479,9 @@ BdsEntry (
   Status = gBS->CalculateCrc32 ((VOID*)gST, gST->Hdr.HeaderSize, &gST->Hdr.CRC32);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = gBS->CalculateCrc32 ((VOID*)gST, gST->Hdr.HeaderSize, &gST->Hdr.CRC32);\r
   ASSERT_EFI_ERROR (Status);\r
 \r

+  // Now we need to setup the EFI System Table with information about the console devices.\r
+  InitializeConsole ();\r
+\r

   // If BootNext environment variable is defined then we just load it !\r
   BootNextSize = sizeof(UINT16);\r
   Status = GetGlobalEnvironmentVariable (L"BootNext", NULL, &BootNextSize, (VOID**)&BootNext);\r
   // If BootNext environment variable is defined then we just load it !\r
   BootNextSize = sizeof(UINT16);\r
   Status = GetGlobalEnvironmentVariable (L"BootNext", NULL, &BootNextSize, (VOID**)&BootNext);\r


@@ -518,9 +521,6 @@ BdsEntry (
   // If Boot Order does not exist then create a default entry\r
   DefineDefaultBootEntries ();\r
 \r
   // If Boot Order does not exist then create a default entry\r
   DefineDefaultBootEntries ();\r
 \r

-  // Now we need to setup the EFI System Table with information about the console devices.\r
-  InitializeConsole ();\r
-\r

   //\r
   // Update the CRC32 in the EFI System Table header\r
   //\r
   //\r
   // Update the CRC32 in the EFI System Table header\r
   //\r