From af89f49b83260a04dece84b34e97560fb85d29ae Mon Sep 17 00:00:00 2001 From: Wonkyu Kim Date: Wed, 10 Oct 2018 11:13:08 -0700 Subject: tianocore : Enable Serial Debug for UEFI payload Debug build Change-Id: I29953250ca278d5b1977be3763359df5110f67c7 Signed-off-by: Wonkyu Kim Reviewed-on: https://review.coreboot.org/29004 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- ...don-t-use-serial-output-for-Release-build.patch | 46 ++++++++++++++++++++++ .../patches/05_CorebootPayloadPkg_noserial.patch | 39 ------------------ 2 files changed, 46 insertions(+), 39 deletions(-) create mode 100644 payloads/external/tianocore/patches/05_CorebootPayloadPkg-don-t-use-serial-output-for-Release-build.patch delete mode 100644 payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch diff --git a/payloads/external/tianocore/patches/05_CorebootPayloadPkg-don-t-use-serial-output-for-Release-build.patch b/payloads/external/tianocore/patches/05_CorebootPayloadPkg-don-t-use-serial-output-for-Release-build.patch new file mode 100644 index 0000000000..a581a8c749 --- /dev/null +++ b/payloads/external/tianocore/patches/05_CorebootPayloadPkg-don-t-use-serial-output-for-Release-build.patch @@ -0,0 +1,46 @@ +From 147174ea833e14ef68a8c5f1366cfbd1468dd1c8 Mon Sep 17 00:00:00 2001 +From: Wonkyu Kim +Date: Wed, 10 Oct 2018 10:59:51 -0700 +Subject: [PATCH] CorebootPayloadPkg: don't use serial output for Release build + +Signed-off-by: Wonkyu Kim +--- + CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 4 ++++ + CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc +index 6ddd64faf7a5..2e7055815add 100644 +--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc ++++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc +@@ -261,7 +261,11 @@ + # + ################################################################################ + [PcdsFeatureFlag] ++!if $(TARGET) == DEBUG + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE ++!else ++ gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE ++!endif + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE +diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc +index 19c203e6cbb6..b00b7b0e1134 100644 +--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc ++++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc +@@ -261,7 +261,11 @@ + # + ################################################################################ + [PcdsFeatureFlag] ++!if $(TARGET) == DEBUG + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE ++!else ++ gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE ++!endif + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE + gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE +-- +2.17.1 + diff --git a/payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch b/payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch deleted file mode 100644 index 0e84b7df12..0000000000 --- a/payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 77f75370d6fbfefb04456f6e1c32c85d4bac8bf5 Mon Sep 17 00:00:00 2001 -From: Matt Devo -Date: Thu, 23 Feb 2017 14:11:14 -0600 -Subject: [PATCH] CorebootPayloadPkg: don't use serial output - ---- - CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 2 +- - CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc -index 1d80fc4f5c..ce360c9e9e 100644 ---- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc -+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc -@@ -261,7 +261,7 @@ - # - ################################################################################ - [PcdsFeatureFlag] -- gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE -+ gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE -diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -index 52b26eb3d0..a27b0873a1 100644 ---- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -@@ -261,7 +261,7 @@ - # - ################################################################################ - [PcdsFeatureFlag] -- gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE -+ gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE --- -2.13.2.725.g09c95d1e9-goog - -- cgit v1.2.3