On 10/17/2014 09:53 PM, Leif Lindholm wrote:

Looks fine, but could probably be merged with the rest of the patches.

Will merge it into the previous patch.

Do you agree?

On Wed, Oct 15, 2014 at 10:58:19PM +0800, Fu Wei wrote:

...

arm64: finally add multiboot/module command support into linux module for aarch64

Signed-off-by: Fu Wei fu.wei@linaro.org

grub-core/Makefile.core.def | 1 + grub-core/loader/arm64/linux.c | 6 ++++++ 2 files changed, 7 insertions(+)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 42443bc..b963a62 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1673,6 +1673,7 @@ module = { ia64_efi = loader/ia64/efi/linux.c; arm = loader/arm/linux.c; arm64 = loader/arm64/linux.c;

• arm64 = loader/arm64/multiboot.c; fdt = lib/fdt.c; common = loader/linux.c; common = lib/cmdline.c;

diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 44f6e3d..1d8c0e8 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -26,6 +26,7 @@ #include <grub/mm.h> #include <grub/types.h> #include <grub/cpu/linux.h> +#include <grub/cpu/multiboot.h> #include <grub/efi/efi.h> #include <grub/efi/pe32.h> #include <grub/i18n.h> @@ -491,6 +492,9 @@ GRUB_MOD_INIT (linux) cmd_devicetree = grub_register_command ("devicetree", grub_cmd_devicetree, 0, N_("Load DTB file."));

• grub_arm64_linux_register_multiboot_command (mod);
• my_mod = mod;

} @@ -499,4 +503,6 @@ GRUB_MOD_FINI (linux) grub_unregister_command (cmd_linux); grub_unregister_command (cmd_initrd); grub_unregister_command (cmd_devicetree);

• grub_arm64_linux_unregister_multiboot_command ();

}

1.9.1