[PATCH edk2-platforms v2 0/3] add X64 PE/COFF emulator to PCI systems

[PATCH edk2-platforms v2 0/3] add X64 PE/COFF emulator to PCI systems

[Ard Biesheuvel]

Add a conditional build time include of the prebuild X64 PE/COFF emulator
binary to some platforms that will be able to make use of it (i.e., have
usable PCI slots)

Changes since v1:
- add Armada entry to the shared .fdf, and drop the default FALSE value (at
  the request of Marcin)

Ard Biesheuvel (3):
  Platform/DeveloperBox: conditionally include the X64 PE/COFF emulator
  Platform/Overdrive: conditionally include the X64 PE/COFF emulator
  Platform/MacchiatoBin: conditionally include the X64 PE/COFF emulator

 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc   | 5 +++--
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 1 +
 Platform/AMD/OverdriveBoard/OverdriveBoard.fdf   | 3 +++
 Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 3 +++
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf        | 4 ++++
 5 files changed, 14 insertions(+), 2 deletions(-)

-- 
2.20.1

[PATCH edk2-platforms v2 1/3] Platform/DeveloperBox: conditionally include the X64 PE/COFF emulator

[Ard Biesheuvel]

Add the X64 emulator to the build if '-D X64EMU_ENABLE=TRUE' is passed
on the build command line. Note that this only works on AARCH64 builds.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 1 +
 Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 4ddb0d427f13..909cfb550757 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -30,6 +30,7 @@
 
   DEFINE DEBUG_ON_UART1          = FALSE
   DEFINE SECURE_BOOT_ENABLE      = FALSE
+  DEFINE X64EMU_ENABLE           = FALSE
 
 !include Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc
 
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index 72997e143de5..e6b42fc2028c 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -159,6 +159,9 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
 !if $(ARCH) == AARCH64
   INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+!if $(X64EMU_ENABLE) == TRUE
+  INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf
+!endif
 !endif
   INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
   INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
-- 
2.20.1

[PATCH edk2-platforms v2 2/3] Platform/Overdrive: conditionally include the X64 PE/COFF emulator

[Ard Biesheuvel]

Add the X64 emulator to the build if '-D X64EMU_ENABLE=TRUE' is passed
on the build command line.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 5 +++--
 Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index b6a1507b4ae3..0e1db0745d89 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -17,8 +17,9 @@
 ################################################################################
 [Defines]
 
-DEFINE NUM_CORES    = 8
-DEFINE DO_FLASHER   = FALSE
+DEFINE NUM_CORES      = 8
+DEFINE DO_FLASHER     = FALSE
+DEFINE X64EMU_ENABLE  = FALSE
 
   PLATFORM_NAME                  = Overdrive
   PLATFORM_GUID                  = B2296C02-9DA1-4CD1-BD48-4D4F0F1276EB
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
index 4b6b808c1454..a058665bccdd 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -159,6 +159,9 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
   INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+!if $(X64EMU_ENABLE) == TRUE
+  INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf
+!endif
 
   #
   # AHCI Support
-- 
2.20.1

[PATCH edk2-platforms v2 3/3] Platform/MacchiatoBin: conditionally include the X64 PE/COFF emulator

[Ard Biesheuvel]

Add the X64 emulator to the build if '-D X64EMU_ENABLE=TRUE' is passed
on the build command line. Note that this only works on AARCH64 builds.
Also note that the edk2-non-osi repository needs to be listed in the
PACKAGES_PATH environment variable.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
index e90e10e69623..ccfeb90102a2 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
@@ -220,6 +220,10 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   # ACPI support
   INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+!if $(X64EMU_ENABLE) == TRUE
+  # PE/COFF emulator for X64 option ROMs taken from edk2-non-osi
+  INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf
+!endif
 !endif
 
 !include $(BOARD_DXE_FV_COMPONENTS)
-- 
2.20.1

Re: [PATCH edk2-platforms v2 0/3] add X64 PE/COFF emulator to PCI systems

[Leif Lindholm]

On Wed, Apr 24, 2019 at 03:23:54PM +0200, Ard Biesheuvel wrote:
> Add a conditional build time include of the prebuild X64 PE/COFF emulator
> binary to some platforms that will be able to make use of it (i.e., have
> usable PCI slots)
> 
> Changes since v1:
> - add Armada entry to the shared .fdf, and drop the default FALSE value (at
>   the request of Marcin)

For the series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> Ard Biesheuvel (3):
>   Platform/DeveloperBox: conditionally include the X64 PE/COFF emulator
>   Platform/Overdrive: conditionally include the X64 PE/COFF emulator
>   Platform/MacchiatoBin: conditionally include the X64 PE/COFF emulator
> 
>  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc   | 5 +++--
>  Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 1 +
>  Platform/AMD/OverdriveBoard/OverdriveBoard.fdf   | 3 +++
>  Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 3 +++
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf        | 4 ++++
>  5 files changed, 14 insertions(+), 2 deletions(-)
> 
> -- 
> 2.20.1
> 

Re: [PATCH edk2-platforms v2 0/3] add X64 PE/COFF emulator to PCI systems

[Ard Biesheuvel]

On Wed, 24 Apr 2019 at 15:33, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Wed, Apr 24, 2019 at 03:23:54PM +0200, Ard Biesheuvel wrote:
> > Add a conditional build time include of the prebuild X64 PE/COFF emulator
> > binary to some platforms that will be able to make use of it (i.e., have
> > usable PCI slots)
> >
> > Changes since v1:
> > - add Armada entry to the shared .fdf, and drop the default FALSE value (at
> >   the request of Marcin)
>
> For the series:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>

Thanks

Pushed as 3826301c6426..bcdcb65cc077

> > Ard Biesheuvel (3):
> >   Platform/DeveloperBox: conditionally include the X64 PE/COFF emulator
> >   Platform/Overdrive: conditionally include the X64 PE/COFF emulator
> >   Platform/MacchiatoBin: conditionally include the X64 PE/COFF emulator
> >
> >  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc   | 5 +++--
> >  Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 1 +
> >  Platform/AMD/OverdriveBoard/OverdriveBoard.fdf   | 3 +++
> >  Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 3 +++
> >  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf        | 4 ++++
> >  5 files changed, 14 insertions(+), 2 deletions(-)
> >
> > --
> > 2.20.1
> >