From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mqHg8-00072r-FB for mharc-grub-devel@gnu.org; Thu, 25 Nov 2021 11:32:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqHg7-000718-Ax for grub-devel@gnu.org; Thu, 25 Nov 2021 11:32:55 -0500 Received: from dibed.net-space.pl ([84.10.22.86]:45372) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_3DES_EDE_CBC_SHA1:192) (Exim 4.90_1) (envelope-from ) id 1mqHg5-0006nu-JW for grub-devel@gnu.org; Thu, 25 Nov 2021 11:32:55 -0500 Received: from router-fw.i.net-space.pl ([192.168.52.1]:45704 "EHLO tomti.i.net-space.pl") by router-fw-old.i.net-space.pl with ESMTP id S2093873AbhKYQcr (ORCPT ); Thu, 25 Nov 2021 17:32:47 +0100 X-Comment: RFC 2476 MSA function at dibed.net-space.pl logged sender identity as: dkiper Date: Thu, 25 Nov 2021 17:32:45 +0100 From: Daniel Kiper To: Nikita Ermakov Cc: GRUB development mailing list , Ard Biesheuvel , Heinrich Schuchardt , Leif Lindholm , Fu Wei Subject: Re: [PATCH v3 7/7] RISC-V: Use common linux loader Message-ID: <20211125163245.76cpmne5bdhckd7w@tomti.i.net-space.pl> References: <20211028203118.7908-1-arei@altlinux.org> <20211028203118.7908-8-arei@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211028203118.7908-8-arei@altlinux.org> User-Agent: NeoMutt/20170113 (1.7.2) Received-SPF: pass client-ip=84.10.22.86; envelope-from=dkiper@net-space.pl; helo=dibed.net-space.pl X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Nov 2021 16:32:55 -0000 On Thu, Oct 28, 2021 at 11:31:20PM +0300, Nikita Ermakov wrote: > From: Atish Patra > > RISC-V doesn't have to do anything very different from other architectures > to loader EFI stub linux kernel. As a result, just use the common linux > loader instead of defining a RISC-V specific linux loader. > > Signed-off-by: Atish Patra > --- > grub-core/Makefile.core.def | 4 +-- > grub-core/loader/riscv/linux.c | 59 ---------------------------------- > include/grub/riscv32/linux.h | 1 + > include/grub/riscv64/linux.h | 1 + > 4 files changed, 4 insertions(+), 61 deletions(-) > delete mode 100644 grub-core/loader/riscv/linux.c > > diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def > index b36cf663a..0536575bc 100644 > --- a/grub-core/Makefile.core.def > +++ b/grub-core/Makefile.core.def > @@ -1809,8 +1809,8 @@ module = { > arm_efi = loader/efi/linux.c; > arm_uboot = loader/arm/linux.c; > arm64 = loader/efi/linux.c; > - riscv32 = loader/riscv/linux.c; > - riscv64 = loader/riscv/linux.c; > + riscv32 = loader/efi/linux.c; > + riscv64 = loader/efi/linux.c; > common = loader/linux.c; > common = lib/cmdline.c; > enable = noemu; > diff --git a/grub-core/loader/riscv/linux.c b/grub-core/loader/riscv/linux.c > deleted file mode 100644 > index d17c488e1..000000000 > --- a/grub-core/loader/riscv/linux.c > +++ /dev/null > @@ -1,59 +0,0 @@ > -/* > - * GRUB -- GRand Unified Bootloader > - * Copyright (C) 2018 Free Software Foundation, Inc. > - * > - * GRUB is free software: you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation, either version 3 of the License, or > - * (at your option) any later version. > - * > - * GRUB is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * You should have received a copy of the GNU General Public License > - * along with GRUB. If not, see . > - */ > - > -#include > -#include > -#include > - > -GRUB_MOD_LICENSE ("GPLv3+"); > - > -static grub_err_t > -grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), > - int argc __attribute__ ((unused)), > - char *argv[] __attribute__ ((unused))) > -{ > - grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("Linux not supported yet")); > - > - return grub_errno; > -} > - > -static grub_err_t > -grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), > - int argc __attribute__ ((unused)), > - char *argv[] __attribute__ ((unused))) > -{ > - grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("Linux not supported yet")); > - > - return grub_errno; > -} > - > -static grub_command_t cmd_linux, cmd_initrd; > - > -GRUB_MOD_INIT (linux) > -{ > - cmd_linux = grub_register_command ("linux", grub_cmd_linux, 0, > - N_("Load Linux.")); > - cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, 0, > - N_("Load initrd.")); > -} > - > -GRUB_MOD_FINI (linux) > -{ > - grub_unregister_command (cmd_linux); > - grub_unregister_command (cmd_initrd); > -} > diff --git a/include/grub/riscv32/linux.h b/include/grub/riscv32/linux.h > index de0dbdcd1..706c69087 100644 > --- a/include/grub/riscv32/linux.h > +++ b/include/grub/riscv32/linux.h > @@ -38,5 +38,6 @@ struct linux_riscv_kernel_header > }; > > #define linux_arch_kernel_header linux_riscv_kernel_header > +# define GRUB_LINUX_ARCH_MAGIC_SIGNATURE GRUB_LINUX_RISCV_MAGIC_SIGNATURE Please put this definition before linux_arch_kernel_header definition. > #endif /* ! GRUB_RISCV32_LINUX_HEADER */ > diff --git a/include/grub/riscv64/linux.h b/include/grub/riscv64/linux.h > index 7c28bc922..88d5df781 100644 > --- a/include/grub/riscv64/linux.h > +++ b/include/grub/riscv64/linux.h > @@ -40,5 +40,6 @@ struct linux_riscv_kernel_header > }; > > #define linux_arch_kernel_header linux_riscv_kernel_header > +# define GRUB_LINUX_ARCH_MAGIC_SIGNATURE GRUB_LINUX_RISCV_MAGIC_SIGNATURE Ditto. Daniel