From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1loYB3-00064d-NT for mharc-grub-devel@gnu.org; Wed, 02 Jun 2021 17:13:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loYB1-0005wA-Jq for grub-devel@gnu.org; Wed, 02 Jun 2021 17:13:23 -0400 Received: from mail-lf1-f47.google.com ([209.85.167.47]:39742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loYAz-00047w-Ql for grub-devel@gnu.org; Wed, 02 Jun 2021 17:13:23 -0400 Received: by mail-lf1-f47.google.com with SMTP id p17so4730476lfc.6 for ; Wed, 02 Jun 2021 14:13:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZnRuqHVPZWKUp3f1c/nV3H9ZwkPdGvS41xRcO5SnFLk=; b=jkKXpX1mkjEdGdC/76jgHDQaeJrsxO1k+rBiebYH4DTpi1ZY7U4aGajzfZJbuW71cc cOfhuij2IKk8xQBkf+FcMh683BY6fLNu1eHq1SgOe4SLPw4hOWRW/5VctCI4sdhFZPMB qsUpIuiMPFHNmLjW06h3Q4MeDnYD24JiJKzRQfNCoQ2UOl4+KdiqEBoejrwE+Lbo1pER fcV/ixBel4ulN62YX01HKvf2kFoBbW4PV4rgsKADH2ycmpg5laBa7Zaev00qAR+QMEt3 gD3dqJLHbt8vZFXPQj2y5yCz8ZvFM7v3rEP2qWK8RAcGrxPYum+/R+KuA+RA+gcrpdiq grbA== X-Gm-Message-State: AOAM532ISxadETYc2sllCh3kK3N73DmNLVNolKW98btjfokBhS/arTqT CHxr2csaae+MPZb8Y0kx1f/pzrVHNqnXUsnW X-Google-Smtp-Source: ABdhPJxryzg3ONWGhgyD7fOohB+1eQf6+VAtVaXaRJY41kgW4vaUxSFeasjsOSbcBl/ntsrF/Bpk8Q== X-Received: by 2002:a05:6512:3882:: with SMTP id n2mr23632901lft.193.1622668400035; Wed, 02 Jun 2021 14:13:20 -0700 (PDT) Received: from localhost.localdomain ([2a00:1370:811f:4a8d:2d8:61ff:fed1:d10a]) by smtp.gmail.com with ESMTPSA id p3sm101361lfa.116.2021.06.02.14.13.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 14:13:19 -0700 (PDT) From: Nikita Ermakov To: GRUB development mailing list Cc: Ard Biesheuvel , Atish Patra , Daniel Kiper , Heinrich Schuchardt , Leif Lindholm , Nikita Ermakov , Atish Patra Subject: [PATCH v2 7/7] RISC-V: Use common linux loader Date: Thu, 3 Jun 2021 00:12:35 +0300 Message-Id: <20210602211235.377366-8-arei@altlinux.org> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210602211235.377366-1-arei@altlinux.org> References: <20210602211235.377366-1-arei@altlinux.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=209.85.167.47; envelope-from=coffe92@gmail.com; helo=mail-lf1-f47.google.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2021 21:13:23 -0000 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 #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 #endif /* ! GRUB_RISCV64_LINUX_HEADER */ -- 2.29.3