On Fri, Jul 28, 2017 at 07:08:42PM +0100, Leif Lindholm wrote:
> On Thu, Jul 27, 2017 at 04:54:19PM +0200, Daniel Kiper wrote:
> > On Mon, Jun 12, 2017 at 03:53:37PM +0100, Leif Lindholm wrote:
> > > There is nothing ARM64 (or even ARM) specific about the efi fdt helper
> > > library, which is used for locating or overriding a firmware-provided
> > > devicetree in a UEFI system - so move it to loader/efi for reuse.
> >
> > OK.
> >
> > > Move the fdtload.h include file to grub/efi
> >
> > This begs one patch...
>
> Sure.
>
> > > and move the EFI page size
> > > definitions to grub/efi/memory.h. (These definitions refer strictly to
> > > allocation operations, as opposed to translation granules.)
> >
> > Great! This is what I requested earlier. However, please put this in
> > separate patch.
>
> Sure.
>
> > > ---
> > > grub-core/Makefile.core.def | 2 +-
> > > grub-core/loader/arm64/linux.c | 3 ++-
> > > grub-core/loader/arm64/xen_boot.c | 3 ++-
> > > grub-core/loader/{arm64 => efi}/fdt.c | 3 ++-
> > > include/grub/{arm64 => efi}/fdtload.h | 3 ---
> > > include/grub/efi/memory.h | 3 +++
> > > 6 files changed, 10 insertions(+), 7 deletions(-)
> > > rename grub-core/loader/{arm64 => efi}/fdt.c (98%)
> > > rename include/grub/{arm64 => efi}/fdtload.h (89%)
> > >
> > > diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
> > > index 1d86bd22e..a65c27f7f 100644
> > > --- a/grub-core/Makefile.core.def
> > > +++ b/grub-core/Makefile.core.def
> > > @@ -1707,7 +1707,7 @@ module = {
> > >
> > > module = {
> > > name = fdt;
> > > - arm64 = loader/arm64/fdt.c;
> > > + arm64 = loader/efi/fdt.c;
> > > common = lib/fdt.c;
> > > enable = fdt;
> > > };
> > > diff --git a/grub-core/loader/arm64/linux.c
> > > b/grub-core/loader/arm64/linux.c
> > > index 9519d2e4d..cac94d53d 100644
> > > --- a/grub-core/loader/arm64/linux.c
> > > +++ b/grub-core/loader/arm64/linux.c
> > > @@ -26,8 +26,9 @@
> > > #include <grub/mm.h>
> > > #include <grub/types.h>
> > > #include <grub/cpu/linux.h>
> > > -#include <grub/cpu/fdtload.h>
> > > #include <grub/efi/efi.h>
> > > +#include <grub/efi/fdtload.h>
> > > +#include <grub/efi/memory.h>
> >
> > Why do you shuffle and add headers?
>
> The shuffling is to fit alphabetically sorted when moving from
> cpu/fdtload.h to efi/fdtload.h.
>
> The addition is because the EFI_PAGE_SHIFT & co moves from
> cpu/fdtload.h into efi/memory.h.
OK, but say about this in commit message please.
Daniel
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
