[v3,01/10] efi: Rename armxx to arch

Message ID	20181114172739.51640-2-agraf@suse.de
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; From: Alexander Graf <agraf@suse.de> To: grub-devel@gnu.org Subject: [PATCH v3 01/10] efi: Rename armxx to arch Date: Wed, 14 Nov 2018 18:27:30 +0100 Message-Id: <20181114172739.51640-2-agraf@suse.de> In-Reply-To: <20181114172739.51640-1-agraf@suse.de> References: <20181114172739.51640-1-agraf@suse.de> Precedence: list Reply-To: The development of GNU GRUB <grub-devel@gnu.org> Cc: "rickchen36 @ gmail . com" <rickchen36@gmail.com>, David Abdurachmanov <david.abdurachmanov@gmail.com>, schwab@suse.de, "greentime @ andestech . com" <greentime@andestech.com>, leif.lindholm@linaro.org, atish.patra@wdc.com, Michael Chang <mchang@suse.com>, Alistair Francis <Alistair.Francis@wdc.com>, Lukas Auer <lukas.auer@aisec.fraunhofer.de>, Paul Walmsley <paul.walmsley@sifive.com>, Bin Meng <bmeng.cn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" <grub-devel-bounces+patch=linaro.org@gnu.org>
Series	Add RISC-V support \| expand [v3,00/10] Add RISC-V support [v3,01/10] efi: Rename armxx to arch [v3,02/10] PE: Add RISC-V definitions [v3,03/10] elf.h: Add RISC-V definitions [v3,04/10] RISC-V: Add setjmp implementation [v3,05/10] RISC-V: Add early startup code [v3,06/10] RISC-V: Add Linux load logic [v3,07/10] RISC-V: Add awareness for RISC-V reloations [v3,08/10] RISC-V: Add auxiliary files [v3,09/10] RISC-V: Add to build system [v3,10/10] fdt: Add device tree file type

Message ID

20181114172739.51640-2-agraf@suse.de

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
	grub-devel-bounces+patch=linaro.org@gnu.org designates
	2001:4830:134:3::11 as permitted sender)
	client-ip=2001:4830:134:3::11; 
From: Alexander Graf <agraf@suse.de>
To: grub-devel@gnu.org
Subject: [PATCH v3 01/10] efi: Rename armxx to arch
Date: Wed, 14 Nov 2018 18:27:30 +0100
Message-Id: <20181114172739.51640-2-agraf@suse.de>
In-Reply-To: <20181114172739.51640-1-agraf@suse.de>
References: <20181114172739.51640-1-agraf@suse.de>
Precedence: list
Reply-To: The development of GNU GRUB <grub-devel@gnu.org>
Cc: "rickchen36 @ gmail . com" <rickchen36@gmail.com>,
	David Abdurachmanov <david.abdurachmanov@gmail.com>, schwab@suse.de, 
	"greentime @ andestech . com" <greentime@andestech.com>,
	leif.lindholm@linaro.org, atish.patra@wdc.com,
	Michael Chang <mchang@suse.com>,
	Alistair Francis <Alistair.Francis@wdc.com>,
	Lukas Auer <lukas.auer@aisec.fraunhofer.de>,
	Paul Walmsley <paul.walmsley@sifive.com>, Bin Meng <bmeng.cn@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org
Sender: "Grub-devel" <grub-devel-bounces+patch=linaro.org@gnu.org>

Series

Add RISC-V support | expand

Commit Message

Alexander Graf Nov. 14, 2018, 5:27 p.m. UTC

Some architectures want to boot Linux as plain UEFI binary. Today that
really only encompasses ARM and AArch64, but going forward more
architectures may adopt that model.

So rename our internal API accordingly.

Signed-off-by: Alexander Graf <agraf@suse.de>

Acked-by: Leif Lindholm <leif.lindholm@linaro.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

---
 grub-core/loader/arm64/linux.c    | 10 +++++-----
 grub-core/loader/arm64/xen_boot.c |  6 +++---
 include/grub/arm/linux.h          |  2 +-
 include/grub/arm64/linux.h        |  2 +-
 include/grub/efi/efi.h            |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

-- 
2.12.3


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Comments

Bin Meng Nov. 18, 2018, 11:41 a.m. UTC | #1

On Thu, Nov 15, 2018 at 1:27 AM Alexander Graf <agraf@suse.de> wrote:
>

> Some architectures want to boot Linux as plain UEFI binary. Today that

> really only encompasses ARM and AArch64, but going forward more

> architectures may adopt that model.

>

> So rename our internal API accordingly.

>

> Signed-off-by: Alexander Graf <agraf@suse.de>

> Acked-by: Leif Lindholm <leif.lindholm@linaro.org>

> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

> ---

>  grub-core/loader/arm64/linux.c    | 10 +++++-----

>  grub-core/loader/arm64/xen_boot.c |  6 +++---

>  include/grub/arm/linux.h          |  2 +-

>  include/grub/arm64/linux.h        |  2 +-

>  include/grub/efi/efi.h            |  4 ++--

>  5 files changed, 12 insertions(+), 12 deletions(-)

>


Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Tested-by: Bin Meng <bmeng.cn@gmail.com>


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
index b8315b53f..d8c12dc8a 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -49,7 +49,7 @@  static grub_addr_t initrd_start;
 static grub_addr_t initrd_end;
 
 grub_err_t
-grub_armxx_efi_linux_check_image (struct linux_armxx_kernel_header * lh)
+grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
 {
   if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE)
     return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
@@ -110,7 +110,7 @@  failure:
 }
 
 grub_err_t
-grub_armxx_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
+grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args)
 {
   grub_efi_memory_mapped_device_path_t *mempath;
   grub_efi_handle_t image_handle;
@@ -173,7 +173,7 @@  grub_linux_boot (void)
   if (finalize_params_linux () != GRUB_ERR_NONE)
     return grub_errno;
 
-  return (grub_armxx_efi_linux_boot_image((grub_addr_t)kernel_addr,
+  return (grub_arch_efi_linux_boot_image((grub_addr_t)kernel_addr,
                                           kernel_size, linux_args));
 }
 
@@ -287,7 +287,7 @@  grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 		int argc, char *argv[])
 {
   grub_file_t file = 0;
-  struct linux_armxx_kernel_header lh;
+  struct linux_arch_kernel_header lh;
 
   grub_dl_ref (my_mod);
 
@@ -306,7 +306,7 @@  grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   if (grub_file_read (file, &lh, sizeof (lh)) < (long) sizeof (lh))
     return grub_errno;
 
-  if (grub_armxx_efi_linux_check_image (&lh) != GRUB_ERR_NONE)
+  if (grub_arch_efi_linux_check_image (&lh) != GRUB_ERR_NONE)
     goto fail;
 
   grub_loader_unset();
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
index 1003a0b99..fdf0a346a 100644
--- a/grub-core/loader/arm64/xen_boot.c
+++ b/grub-core/loader/arm64/xen_boot.c
@@ -265,7 +265,7 @@  xen_boot (void)
   if (err)
     return err;
 
-  return grub_armxx_efi_linux_boot_image (xen_hypervisor->start,
+  return grub_arch_efi_linux_boot_image (xen_hypervisor->start,
 					  xen_hypervisor->size,
 					  xen_hypervisor->cmdline);
 }
@@ -468,8 +468,8 @@  grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)),
 
   if (grub_file_read (file, &sh, sizeof (sh)) != (long) sizeof (sh))
     goto fail;
-  if (grub_armxx_efi_linux_check_image
-      ((struct linux_armxx_kernel_header *) &sh) != GRUB_ERR_NONE)
+  if (grub_arch_efi_linux_check_image
+      ((struct linux_arch_kernel_header *) &sh) != GRUB_ERR_NONE)
     goto fail;
   grub_file_seek (file, 0);
 
diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
index 712ba17b9..995800126 100644
--- a/include/grub/arm/linux.h
+++ b/include/grub/arm/linux.h
@@ -36,7 +36,7 @@  struct linux_arm_kernel_header {
 
 #if defined(__arm__)
 # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
-# define linux_armxx_kernel_header linux_arm_kernel_header
+# define linux_arch_kernel_header linux_arm_kernel_header
 #endif
 
 #if defined GRUB_MACHINE_UBOOT
diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
index 8655067e0..4269adc6d 100644
--- a/include/grub/arm64/linux.h
+++ b/include/grub/arm64/linux.h
@@ -38,7 +38,7 @@  struct linux_arm64_kernel_header
 
 #if defined(__aarch64__)
 # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
-# define linux_armxx_kernel_header linux_arm64_kernel_header
+# define linux_arch_kernel_header linux_arm64_kernel_header
 #endif
 
 #endif /* ! GRUB_ARM64_LINUX_HEADER */
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 2c6648d46..ec44aef7e 100644
--- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h
@@ -94,8 +94,8 @@  extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd,
 void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
 grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
 #include <grub/cpu/linux.h>
-grub_err_t grub_armxx_efi_linux_check_image(struct linux_armxx_kernel_header *lh);
-grub_err_t grub_armxx_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
+grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh);
+grub_err_t grub_arch_efi_linux_boot_image(grub_addr_t addr, grub_size_t size,
                                            char *args);
 #endif

[v3,01/10] efi: Rename armxx to arch

Commit Message

Comments

Patch