From 3440a0c215478a506b5bc773c049566997d59eec Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Fri, 4 Oct 2013 15:56:01 +0100 Subject: [PATCH] FVP: add EDK2_SIMPLE_CONSOLE support LAVA is not able to handle the control codes output by UEFI so this patch adds support for a simpler console with less control codes. Signed-off-by: Ryan Harkin --- .../ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc | 6 +++++- .../ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc index 194be40..ee2be3e 100755 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -245,10 +245,14 @@ EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf - MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +!ifdef $(EDK2_SIMPLE_CONSOLE) + EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf +!else + MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf EmbeddedPkg/SerialDxe/SerialDxe.inf +!endif MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf index b35a4da..86112ac 100755 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -166,10 +166,14 @@ READ_LOCK_STATUS = TRUE # Multiple Console IO support # INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf - INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +!ifdef $(EDK2_SIMPLE_CONSOLE) + INF EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf +!else + INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf INF EmbeddedPkg/SerialDxe/SerialDxe.inf +!endif INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf -- 1.7.9.5