OvmfPkg: Drop build flag USE_LEGACY_ISA_STACK and legacy ISA stack

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1842

According to the discussion at:
https://edk2.groups.io/g/devel/topic/30918343#38093

For OVMF, we keep both ISA stacks:
* The legacy one in PcAtChipsetPkg/IntelFrameworkModulePkg
* The Sio bus based OVMF-specified one introduced by commit a5cc178aeb

for a period of time (includes 1 stable tag: edk2-stable201905). And we
also keep the Sio bus based OVMF-specified stack as the default one (via a
build option 'USE_LEGACY_ISA_STACK') to validate its stability.

This commit will propose to drop the legacy ISA stack from OVMF and remove
the usage of the build flag 'USE_LEGACY_ISA_STACK' at the same time. This
is considered as a preparation for the removal of
PcAtChipsetPkg/IsaAcpiDxe & IntelFrameworkModulePkg.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index e74a9d5a51496f49286675959d584e563c8fbb78..8281f409f2c5e4c7490647c31821dd9c876b0fb8 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -32,7 +32,6 @@
   DEFINE SMM_REQUIRE             = FALSE\r
   DEFINE TPM2_ENABLE             = FALSE\r
   DEFINE TPM2_CONFIG_ENABLE      = FALSE\r
-  DEFINE USE_LEGACY_ISA_STACK    = FALSE\r
 \r
   #\r
   # Network definition\r
@@ -748,16 +747,9 @@
   #\r
   # ISA Support\r
   #\r
-!if $(USE_LEGACY_ISA_STACK) == FALSE\r
   OvmfPkg/SioBusDxe/SioBusDxe.inf\r
   MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
   MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
-!else\r
-  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
-!endif\r
 \r
   #\r
   # SMBIOS Support\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index e428334702b812040b8ecded1699e28faf3462d6..12da9f4706bdfab45da5acf27be76517ec672f0a 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -259,20 +259,11 @@ INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 \r
-!if $(USE_LEGACY_ISA_STACK) == FALSE\r
-  INF  OvmfPkg/SioBusDxe/SioBusDxe.inf\r
+INF  OvmfPkg/SioBusDxe/SioBusDxe.inf\r
 !ifndef $(SOURCE_DEBUG_ENABLE)\r
-  INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
-!endif\r
-  INF  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
-!else\r
-  INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
-!ifndef $(SOURCE_DEBUG_ENABLE)\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
-!endif\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
 !endif\r
+INF  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
 INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 67ac015991fd116a2f7e7074ce48ce4fd2967c0e..30d094d21703afabc0f49e9c7fc8448a2a7a390e 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -32,7 +32,6 @@
   DEFINE SMM_REQUIRE             = FALSE\r
   DEFINE TPM2_ENABLE             = FALSE\r
   DEFINE TPM2_CONFIG_ENABLE      = FALSE\r
-  DEFINE USE_LEGACY_ISA_STACK    = FALSE\r
 \r
   #\r
   # Network definition\r
@@ -757,16 +756,9 @@
   #\r
   # ISA Support\r
   #\r
-!if $(USE_LEGACY_ISA_STACK) == FALSE\r
   OvmfPkg/SioBusDxe/SioBusDxe.inf\r
   MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
   MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
-!else\r
-  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
-!endif\r
 \r
   #\r
   # SMBIOS Support\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 6ddffe75475b9c9c11c2b9946188f9337535647b..47ac7d86464be91a409d7cf9e7ac44b8028b4af1 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -260,20 +260,11 @@ INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 \r
-!if $(USE_LEGACY_ISA_STACK) == FALSE\r
-  INF  OvmfPkg/SioBusDxe/SioBusDxe.inf\r
+INF  OvmfPkg/SioBusDxe/SioBusDxe.inf\r
 !ifndef $(SOURCE_DEBUG_ENABLE)\r
-  INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
-!endif\r
-  INF  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
-!else\r
-  INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
-!ifndef $(SOURCE_DEBUG_ENABLE)\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
-!endif\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
 !endif\r
+INF  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
 INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 68073ef55b4dad046fc250531a684d0c33cfdb62..705795f0da321b47ffdd84250445a3ff6de68694 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -32,7 +32,6 @@
   DEFINE SMM_REQUIRE             = FALSE\r
   DEFINE TPM2_ENABLE             = FALSE\r
   DEFINE TPM2_CONFIG_ENABLE      = FALSE\r
-  DEFINE USE_LEGACY_ISA_STACK    = FALSE\r
 \r
   #\r
   # Network definition\r
@@ -755,16 +754,9 @@
   #\r
   # ISA Support\r
   #\r
-!if $(USE_LEGACY_ISA_STACK) == FALSE\r
   OvmfPkg/SioBusDxe/SioBusDxe.inf\r
   MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
   MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
-!else\r
-  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
-  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
-!endif\r
 \r
   #\r
   # SMBIOS Support\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 6ddffe75475b9c9c11c2b9946188f9337535647b..47ac7d86464be91a409d7cf9e7ac44b8028b4af1 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -260,20 +260,11 @@ INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 \r
-!if $(USE_LEGACY_ISA_STACK) == FALSE\r
-  INF  OvmfPkg/SioBusDxe/SioBusDxe.inf\r
+INF  OvmfPkg/SioBusDxe/SioBusDxe.inf\r
 !ifndef $(SOURCE_DEBUG_ENABLE)\r
-  INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
-!endif\r
-  INF  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
-!else\r
-  INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
-!ifndef $(SOURCE_DEBUG_ENABLE)\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
-!endif\r
-  INF  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
 !endif\r
+INF  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
 INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r