| Message ID | CAKv+Gu9VmHmP1kXWeHjApeXW5j7LvPELHrLN36WvD+J6z=6b9A@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
On 07/06/16 14:35, Ard Biesheuvel wrote: > On 4 July 2016 at 16:32, Leif Lindholm <leif.lindholm@linaro.org> wrote: >> On Fri, Jul 01, 2016 at 05:43:52PM +0200, Ard Biesheuvel wrote: >>> The MMU routines are only used by a small subset of the users of ArmLib. >>> In order to prevent all those users to have to run the library constructor >>> to clean some MMU handling routines to the PoC, split off all MMU handling >>> into a separate ArmMmuLib. >>> >>> NOTE: this change will affect out-of-tree platforms, which will need to add the >>> ArmMmuLib library class resolution to their .DSC descriptions. >>> >>> Changes since v1: >>> - updated ArmVirtQemuKernel as well as ArmVirtQemu and ArmVirtXen to switch to >>> the new ArmMmuLib (#3) >>> - added tags from Laszlo and Star (#3) >>> - dropped ArmLib reference from DxeIp l(#3) [*] >>> - clarified comment (#4) >> >> For the series: >> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> >> > > Thanks. > > For the record, I need to fold the following hunks into patch #3 to > ensure things keep working (but this only affects out of tree ARM > platforms since ArmVirtPkg has its own implementation of > MemoryInitPeiLib) > > """ > diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c > b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c > index f54ec3672a2d..75e6631d7f30 100644 > --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c > +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c > @@ -14,6 +14,7 @@ > > #include <PiPei.h> > > +#include <Library/ArmMmuLib.h> > #include <Library/ArmPlatformLib.h> > #include <Library/DebugLib.h> > #include <Library/HobLib.h> > diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf > b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf > index 6d22b7c03441..cbdca6f532a9 100644 > --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf > +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf > @@ -33,7 +33,7 @@ [Packages] > [LibraryClasses] > DebugLib > HobLib > - ArmLib > + ArmMmuLib > ArmPlatformLib > > [Guids] > """ > > Since it is a trivial fixup for an expected issue following the split > of ArmLib into ArmLib/ArmMmuLib, I am going to assume that everyone is > ok with that without another round of review. > > Thanks, > Ard. > Sure. :) _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c index f54ec3672a2d..75e6631d7f30 100644 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.c @@ -14,6 +14,7 @@ #include <PiPei.h> +#include <Library/ArmMmuLib.h> #include <Library/ArmPlatformLib.h> #include <Library/DebugLib.h> #include <Library/HobLib.h> diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf index 6d22b7c03441..cbdca6f532a9 100644 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf @@ -33,7 +33,7 @@ [Packages] [LibraryClasses] DebugLib HobLib - ArmLib + ArmMmuLib ArmPlatformLib [Guids]