mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 12:26:52 +02:00
62e5204677
rebase patches and reuse upgrade patches when possible patches 0001-0013 are cherry-picked from upstream
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
8eeb75da64902398f6b79e0ea665a8b866c86165 loader: Move arm64 linux loader to common code
|
|
grub-core/Makefile.core.def | 4 ++--
|
|
grub-core/loader/{arm64 => efi}/linux.c | 0
|
|
include/grub/arm/linux.h | 2 +-
|
|
include/grub/arm64/linux.h | 2 +-
|
|
4 files changed, 4 insertions(+), 4 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 8022e1c0a..b36cf663a 100644
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -1806,9 +1806,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;
|
|
common = loader/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
|
|
diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
|
|
index f38e695b1..a9509a997 100644
|
|
--- a/include/grub/arm/linux.h
|
|
+++ b/include/grub/arm/linux.h
|
|
@@ -40,7 +40,7 @@ struct linux_arm_kernel_header {
|
|
};
|
|
|
|
#if defined(__arm__)
|
|
-# define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
|
|
+# define GRUB_LINUX_ARCH_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
|
|
# define linux_arch_kernel_header linux_arm_kernel_header
|
|
#endif
|
|
|
|
diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
|
|
index 3da71a512..37238de7e 100644
|
|
--- a/include/grub/arm64/linux.h
|
|
+++ b/include/grub/arm64/linux.h
|
|
@@ -41,7 +41,7 @@ struct linux_arm64_kernel_header
|
|
};
|
|
|
|
#if defined(__aarch64__)
|
|
-# define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
|
|
+# define GRUB_LINUX_ARCH_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
|
|
# define linux_arch_kernel_header linux_arm64_kernel_header
|
|
#endif
|
|
|
|
--
|
|
2.39.2
|
|
|