diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2019-01-14 17:57:16 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2019-01-16 21:41:00 +0100 |
| commit | 36d0f117e186d8b5fd2e380587b5b8854eeca463 (patch) | |
| tree | eca6b41ac87c2b066dab4662b064f4a069d25f6d | |
| parent | 8cd8d55004dbafce51a1680da7d437019146dd82 (diff) | |
Platform/Socionext/DeveloperBox: disable EbcDxe for ARM builds
EBC and 32-bit ARM are fundamentally incompatible, so only enable
it on AArch64 builds.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
| -rw-r--r-- | Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 4 | ||||
| -rw-r--r-- | Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index da450a13..8fb257ab 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -616,7 +616,6 @@ }
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf
MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
@@ -743,3 +742,6 @@ <BuildOptions>
*_*_*_CC_FLAGS = -DFIRMWARE_VENDOR=\"$(FIRMWARE_VENDOR)\" -DBUILD_NUMBER=\"$(BUILD_NUMBER)\"
}
+
+[Components.AARCH64]
+ MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf index 4a234a36..238f1c20 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf @@ -147,7 +147,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 $(ARCH) == AARCH64
INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+!endif
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
|