diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2015-01-15 12:33:42 +0000 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2015-03-19 16:49:04 +0000 |
| commit | 2b87b98c92c73517f16ea0a159e75bb4c938d737 (patch) | |
| tree | ee5be88e4b3790148d38f876c6ffd9696609be33 | |
| parent | fd9f7673ad64b468e1162120bc908ab3ba7d7336 (diff) | |
ARM: conditionalise inclusion of LinuxLoader/AndroidFastboot
When booting Linux using the UEFI stub loader, there is no need for the
built-in LinuxLoader. So make its inclusion conditional. This requires
also conditionalising the AndroidFastBoot support, which on ARM depends
on the LinuxLoader.
Since conditionalising something currently always included, invert the
logic and use a NO_LINUX_LOADER option to remove these components.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
| -rw-r--r-- | ArmPkg/ArmPkg.dsc | 4 | ||||
| -rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 4 | ||||
| -rw-r--r-- | EmbeddedPkg/EmbeddedPkg.dsc | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 6959fde22..079d411d9 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -138,7 +138,9 @@ ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
+!ifndef NO_LINUX_LOADER
ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf
+!endif
[Components.ARM]
ArmPkg/Library/BaseMemoryLibVstm/BaseMemoryLibVstm.inf
@@ -154,7 +156,9 @@ ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf
ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
+!ifndef NO_LINUX_LOADER
ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf
+!endif
[Components.AARCH64]
ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc index 483e86983..fa7351a36 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -337,9 +337,11 @@ gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20
gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0
+!ifndef NO_LINUX_LOADER
# Device path of block device on which Android Fastboot should flash
# partitions. We just use the SD card on VExpress.
gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath|L"VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)"
+!endif
#
# ARM Pcds
@@ -402,12 +404,14 @@ # ISP1761 USB OTG Controller
EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+!ifndef NO_LINUX_LOADER
#
# Android Fastboot
#
EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf
+!endif
# FV Filesystem
MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index d3f8e7c50..a11480a69 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -272,9 +272,11 @@ # FDT installation
EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
+!ifndef NO_LINUX_LOADER
EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf
+!endif
# Drivers
EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
|