diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-04-14 11:52:55 +0000 |
---|---|---|
committer | oliviermartin <oliviermartin@Edk2> | 2015-04-14 11:52:55 +0000 |
commit | d94a48c71a67b646903670bfd2426501e4634bd6 (patch) | |
tree | d72eb16da5665a570d07c36acaac0fe58a917695 /ArmPlatformPkg/MemoryInitPei | |
parent | 15f7a89f77068ff499a4d27d4486c7bf8496ba26 (diff) | |
download | edk2-d94a48c71a67b646903670bfd2426501e4634bd6.zip edk2-d94a48c71a67b646903670bfd2426501e4634bd6.tar.gz edk2-d94a48c71a67b646903670bfd2426501e4634bd6.tar.bz2 |
ArmPlatformPkg: do not fulfil MemoryInitPeiLib dependency directly via .c file
MemoryInitPeim short-circuits its MemoryInitPeiLib dependency by including
the .c file directly. This prevents us from having a special implementation
for ArmVirtualizationPkg that performs additional cache maintenance before
enabling the MMU. So instead, make it depend on the library class.
Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17175 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg/MemoryInitPei')
-rwxr-xr-x | ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf | 4 | ||||
-rwxr-xr-x | ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf index 1e5b93e..6d22b7c 100755 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf @@ -15,9 +15,9 @@ INF_VERSION = 0x00010005
BASE_NAME = ArmMemoryInitPeiLib
FILE_GUID = 55ddb6e0-70b5-11e0-b33e-0002a5d5c51b
- MODULE_TYPE = SEC
+ MODULE_TYPE = BASE
VERSION_STRING = 1.0
- LIBRARY_CLASS = PlatformPeiLib
+ LIBRARY_CLASS = MemoryInitPeiLib|SEC PEIM
[Sources]
MemoryInitPeiLib.c
diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf index 6374b63..2c14a9c 100755 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf @@ -28,7 +28,6 @@ [Sources]
MemoryInitPeim.c
- MemoryInitPeiLib.c
[Packages]
MdePkg/MdePkg.dec
@@ -43,6 +42,7 @@ HobLib
ArmLib
ArmPlatformLib
+ MemoryInitPeiLib
[Guids]
gEfiMemoryTypeInformationGuid
|