diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2015-01-14 12:32:42 +0000 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2015-03-19 16:49:04 +0000 |
| commit | bf1e1885617cb962bd2d2903d4b12c70b1c639c0 (patch) | |
| tree | 45352b5e76e5fa856121d2d1b61acb98e9b01dbb | |
| parent | f088309601537cfa2a6392a84b4d82111d52fa46 (diff) | |
ArmPkg/ArmPlatformPkg: don't use BdsLib with PlatformIntelBdsLib
There is no longer a requirement for the whole of BdsLib to be included
when building with -D INTEL_BDS, so conditionalise its inclusion in
various places, and use ArmBdsHelperLib instead in PlatformIntelBdsLib.
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/ArmPlatformPkg.dsc | 2 | ||||
| -rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 4 | ||||
| -rw-r--r-- | ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 1 | ||||
| -rw-r--r-- | ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 2 |
5 files changed, 11 insertions, 2 deletions
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 079d411d9..0d1cd07e7 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 ada59bdeb..94f4cc984 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 6c5efdf63..5b1e77549 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -112,9 +112,11 @@ # BDS Libraries
ArmBdsHelperLib|ArmPkg/Library/ArmBdsHelperLib/ArmBdsHelperLib.inf
+!ifndef INTEL_BDS
BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
-
+!endif
AcpiLib|EmbeddedPkg/Library/AcpiLib/AcpiLib.inf
+
FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
# RunAxf support via Dynamic Shell Command protocol
diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c index c07fc0f60..2d02f3829 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 235589adf..95b9f1564 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
|