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

[PATCH edk2-platforms 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)

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/AMD/OverdriveBoard/OverdriveBoard.fdf            | 3 +++
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc          | 1 +
 Platform/Socionext/DeveloperBox/DeveloperBox.fdf          | 3 +++
 Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc     | 1 +
 Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc | 3 +++
 6 files changed, 14 insertions(+), 2 deletions(-)

-- 
2.17.1

[PATCH edk2-platforms 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.17.1

[PATCH edk2-platforms 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 93d351de5a27..46d242489b66 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.17.1

[PATCH edk2-platforms 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>
---
 Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc     | 1 +
 Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
index d08013612ff7..0156c6edc8a5 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
@@ -46,6 +46,7 @@
   FLASH_DEFINITION               = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
   BOARD_DXE_FV_COMPONENTS        = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
   CAPSULE_ENABLE                 = TRUE
+  X64EMU_ENABLE                  = FALSE
 
 !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
 
diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
index 254fcee3419c..ce3ed1bce82a 100644
--- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
+++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
@@ -19,4 +19,7 @@
 
 !if $(ARCH) == AARCH64
   INF RuleOverride = ACPITABLE Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
+!if $(X64EMU_ENABLE) == TRUE
+  INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf
+!endif
 !endif
-- 
2.17.1

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

[Marcin Wojtas]

Hi Ard,


wt., 16 kwi 2019 o 00:43 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>
> 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>
> ---
>  Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc     | 1 +
>  Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc | 3 +++
>  2 files changed, 4 insertions(+)
>
> diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> index d08013612ff7..0156c6edc8a5 100644
> --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
> @@ -46,6 +46,7 @@
>    FLASH_DEFINITION               = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>    BOARD_DXE_FV_COMPONENTS        = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
>    CAPSULE_ENABLE                 = TRUE
> +  X64EMU_ENABLE                  = FALSE

Do we need to explicitly disable? It should be FALSE by default anyway.

>
>  !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>
> diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
> index 254fcee3419c..ce3ed1bce82a 100644
> --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
> +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc
> @@ -19,4 +19,7 @@
>
>  !if $(ARCH) == AARCH64
>    INF RuleOverride = ACPITABLE Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin.inf
> +!if $(X64EMU_ENABLE) == TRUE
> +  INF Emulator/X86EmulatorDxe/X86EmulatorDxe.inf
> +!endif
>  !endif

While on it, could you please move it to
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf ?
There will be PCIE slots enabled on other boards as well, so I'd
prefer to keep this option common from the beginning.

Thanks,
Marcin

> --
> 2.17.1
>
>
> 
>