From fbce87cd3965c3b7e113bac48e15a8d787c52e20 Mon Sep 17 00:00:00 2001 From: Atish Patra Date: Thu, 9 Mar 2023 15:59:51 -0800 Subject: [PATCH] loader/efi: Move ARM64 linux loader to common code ARM64 linux loader code is written in such a way that it can be reused across different architectures without much change. Move it to common code so that RISC-V doesn't have to define a separate loader. Signed-off-by: Atish Patra Reviewed-by: Daniel Kiper --- grub-core/Makefile.core.def | 4 ++-- grub-core/loader/{arm64 => efi}/linux.c | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename grub-core/loader/{arm64 => efi}/linux.c (100%) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 501cb008d..03997b4e5 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1833,9 +1833,9 @@ module = { sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c; ia64_efi = loader/ia64/efi/linux.c; arm_coreboot = loader/arm/linux.c; - arm_efi = loader/arm64/linux.c; + arm_efi = loader/efi/linux.c; arm_uboot = loader/arm/linux.c; - arm64 = loader/arm64/linux.c; + arm64 = loader/efi/linux.c; riscv32 = loader/riscv/linux.c; riscv64 = loader/riscv/linux.c; emu = loader/emu/linux.c; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/efi/linux.c similarity index 100% rename from grub-core/loader/arm64/linux.c rename to grub-core/loader/efi/linux.c