diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2015-01-14 12:32:42 +0000 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2015-01-16 18:13:35 +0000 |
| commit | 2e51979d662db576a74e424d821f2183bf8ebfb4 (patch) | |
| tree | 2ae4288fe05878bd7c558671349b91c940e9befb /ArmPlatformPkg | |
| parent | 731fd87195cf9c22bef8c9862a2baae7a5f661ab (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>
Diffstat (limited to 'ArmPlatformPkg')
4 files changed, 6 insertions, 1 deletions
diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc index 81402da5b3..dfc84304c4 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 1817227dad..db3502cf95 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -113,7 +113,9 @@ # 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
diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c index c07fc0f607..2d02f38296 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 235589adf5..95b9f1564d 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
|