There is no longer a requirement for BdsLib to be included when building with -D INTEL_BDS, so conditionalise its inclusion in various places.
Also drop Android Fastboot components, which have some hard dependencies on BdsLib.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm leif.lindholm@linaro.org --- ArmPkg/ArmPkg.dsc | 4 ++++ ArmPlatformPkg/ArmPlatformPkg.dsc | 2 ++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 4 ++++ ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 1 + ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 2 +- 5 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index be5126c..7287231 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -75,7 +75,9 @@ PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
+!ifndef INTEL_BDS BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf +!endif FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf @@ -108,7 +110,9 @@ ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf ArmPkg/Library/ArmLib/Null/NullArmLib.inf ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf +!ifndef INTEL_BDS ArmPkg/Library/BdsLib/BdsLib.inf +!endif ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc index 81402da..dfc8430 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dsc +++ b/ArmPlatformPkg/ArmPlatformPkg.dsc @@ -110,7 +110,9 @@ SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
# BDS Libraries +!ifndef INTEL_BDS BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf +!endif FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
[LibraryClasses.ARM] diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc index f8b7511..07f4e8b 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -112,7 +112,9 @@ SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
# BDS Libraries +!ifndef INTEL_BDS BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf +!endif FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
# RunAxf support via Dynamic Shell Command protocol @@ -399,9 +401,11 @@ # ISP1761 USB OTG Controller EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
+!ifndef INTEL_BDS # # Android Fastboot # EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf +!endif diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c index c07fc0f..2d02f38 100644 --- a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c +++ b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c @@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
#include "IntelBdsPlatform.h" +#include <Library/ArmBdsHelperLib.h>
/// /// Predefined platform default time out value diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf b/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf index 235589a..95b9f15 100644 --- a/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf +++ b/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf @@ -42,9 +42,9 @@ IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
[LibraryClasses] + ArmBdsHelperLib BaseLib BaseMemoryLib - BdsLib DebugLib DevicePathLib MemoryAllocationLib