CorebootPayloadPkg: Switch to use generic BdxDxe driver

Switch over to use BdxDxe generic driver in MdeModulePkg.

Cc: Prince Agyeman <prince.agyeman@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Maurice Ma <maurice.ma@intel.com>
Reviewed-by: Prince Agyeman <prince.agyeman@intel.com>

4 files changed, 55 insertions, 14 deletions

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 848438ffad..decc1ac82c 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -86,7 +86,8 @@ INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe
 

 INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

 INF UefiCpuPkg/CpuDxe/CpuDxe.inf

-INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

+INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+INF MdeModulePkg/Application/UiApp/UiApp.inf

 INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf

 INF MdeModulePkg/Universal/Metronome/Metronome.inf

 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index 7db4e15edc..dcc015140d 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -137,6 +137,7 @@
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf

+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

 

   #

   # Generic Modules

@@ -146,7 +147,7 @@
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

-  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

+  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

 

   #

@@ -162,14 +163,13 @@
   ResetSystemLib|CorebootPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf

   SerialPortLib|CorebootModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf

   PlatformHookLib|CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf

-  PlatformBdsLib|CorebootPayloadPkg/Library/PlatformBdsLib/PlatformBdsLib.inf

+  PlatformBootManagerLib|CorebootPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

 

   #

   # Misc

   #

   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

 !if $(SOURCE_DEBUG_ENABLE) == TRUE

   PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf

   DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf

@@ -179,6 +179,8 @@
 !endif

   CbParseLib|CorebootModulePkg/Library/CbParseLib/CbParseLib.inf

   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

+  LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 

 [LibraryClasses.IA32.SEC]

   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

@@ -224,7 +226,7 @@
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf

 

 [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION]

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

@@ -247,6 +249,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x10000

 

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }

 

 !if $(SOURCE_DEBUG_ENABLE)

   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2

@@ -310,6 +313,19 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

+

+  ## This PCD defines the video horizontal resolution.

+  #  This PCD could be set to 0 then video resolution could be at highest resolution.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0

+  ## This PCD defines the video vertical resolution.

+  #  This PCD could be set to 0 then video resolution could be at highest resolution.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0

+

+  ## The PCD is used to specify the video horizontal resolution of text setup.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|0

+  ## The PCD is used to specify the video vertical resolution of text setup.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|0

 

 ################################################################################

 #

@@ -353,7 +369,13 @@
   #

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

   UefiCpuPkg/CpuDxe/CpuDxe.inf

-  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+  MdeModulePkg/Application/UiApp/UiApp.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf

+  }

   PcAtChipsetPkg/8254TimerDxe/8254Timer.inf

   MdeModulePkg/Universal/Metronome/Metronome.inf

   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index 730134637f..8c05ca2e4e 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -139,6 +139,7 @@
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf

+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

 

   #

   # Generic Modules

@@ -148,7 +149,7 @@
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

-  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

+  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

 

   #

@@ -164,14 +165,13 @@
   ResetSystemLib|CorebootPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf

   SerialPortLib|CorebootModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf

   PlatformHookLib|CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf

-  PlatformBdsLib|CorebootPayloadPkg/Library/PlatformBdsLib/PlatformBdsLib.inf

+  PlatformBootManagerLib|CorebootPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

 

   #

   # Misc

   #

   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

 !if $(SOURCE_DEBUG_ENABLE) == TRUE

   PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf

   DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf

@@ -182,6 +182,7 @@
   CbParseLib|CorebootModulePkg/Library/CbParseLib/CbParseLib.inf

   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

   LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 

 [LibraryClasses.IA32.SEC]

   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

@@ -227,7 +228,7 @@
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf

 

 [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION]

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

@@ -251,6 +252,7 @@
 

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0

   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }

 

 !if $(SOURCE_DEBUG_ENABLE)

   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2

@@ -314,6 +316,19 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

+

+  ## This PCD defines the video horizontal resolution.

+  #  This PCD could be set to 0 then video resolution could be at highest resolution.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0

+  ## This PCD defines the video vertical resolution.

+  #  This PCD could be set to 0 then video resolution could be at highest resolution.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0

+

+  ## The PCD is used to specify the video horizontal resolution of text setup.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|0

+  ## The PCD is used to specify the video vertical resolution of text setup.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|0

 

 ################################################################################

 #

@@ -357,7 +372,13 @@
   #

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

   UefiCpuPkg/CpuDxe/CpuDxe.inf

-  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+  MdeModulePkg/Application/UiApp/UiApp.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf

+  }

   PcAtChipsetPkg/8254TimerDxe/8254Timer.inf

   MdeModulePkg/Universal/Metronome/Metronome.inf

   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

diff --git a/CorebootPayloadPkg/FbGop/FbGop.inf b/CorebootPayloadPkg/FbGop/FbGop.inf
index 5247c909cf..0d97387679 100644
--- a/CorebootPayloadPkg/FbGop/FbGop.inf
+++ b/CorebootPayloadPkg/FbGop/FbGop.inf
@@ -68,6 +68,3 @@
   gEfiEdidDiscoveredProtocolGuid

   gEfiEdidActiveProtocolGuid

   

-[Pcd]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution

-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution