From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lmcBg-00089x-TB for mharc-grub-devel@gnu.org; Fri, 28 May 2021 09:06:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmcBZ-0007wW-Qp for grub-devel@gnu.org; Fri, 28 May 2021 09:05:59 -0400 Received: from mail-lj1-f182.google.com ([209.85.208.182]:34621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmcBV-0002I2-AZ for grub-devel@gnu.org; Fri, 28 May 2021 09:05:57 -0400 Received: by mail-lj1-f182.google.com with SMTP id b12so5189139ljp.1 for ; Fri, 28 May 2021 06:05:52 -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=OrXUBrrN+iOuAIPgJbb2PEjJmL6syon/qHiFwtmX4Pk=; b=BQUSob8UbIGEEAxhjaRH1LmKby+oe2tPAqDH7mlQpZG0SIa5wmJECmc/Yg9PjCXx6J QceYNmzqmA+l66Bg4fume11WdeZPZSiU/qbiuVCnGSvqF4H5+oWSiRoM5OB1lXmfbJtK pbTNlnmY1Bv98d3ksctW4YMPUBGD8Wmx0F2plSmnOs5HCoYNSCc4It7VkZH5fsHIMzZz vkm08xPA6BNu/6TaYaGf+fp6oF7HQlwYfZaTsT9Ys+CUoBpWK4OVYOr63FAoq5mzpXEx yw0IGaNiY6gllnqE2C1FfRmbCvNSGM2cjzhBxngHRPs23p/dasZbrv4ZnXzDlkjjS/tP /rmw== X-Gm-Message-State: AOAM530svI7udJcOo+WjFUUl92UUMyMa8MYxQXLwPf8945CquwNbWKe1 41TKZK+aWFFYipVuw+QSeffSSgsLC3i8ZVYbb3T5pQ== X-Google-Smtp-Source: ABdhPJz8bsh3GlEJB035gH751650oQB8GlmUbW+uT2WMb1NCmHP2Dqs5V878EIvx8kJTyRW5Uh7jEQ== X-Received: by 2002:a05:651c:2ca:: with SMTP id f10mr6439774ljo.236.1622207150174; Fri, 28 May 2021 06:05:50 -0700 (PDT) Received: from localhost.localdomain (109-252-124-217.nat.spd-mgts.ru. [109.252.124.217]) by smtp.gmail.com with ESMTPSA id m25sm468129lfr.288.2021.05.28.06.05.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 May 2021 06:05:49 -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 5/8] loader: Move arm64 linux loader to common code Date: Fri, 28 May 2021 16:04:54 +0300 Message-Id: <20210528130457.13501-6-arei@altlinux.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210528130457.13501-1-arei@altlinux.org> References: <20210528130457.13501-1-arei@altlinux.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=209.85.208.182; envelope-from=coffe92@gmail.com; helo=mail-lj1-f182.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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: Fri, 28 May 2021 13:05:59 -0000 From: Atish Patra 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 --- grub-core/Makefile.core.def | 4 ++-- grub-core/loader/{arm64 => efi}/linux.c | 2 +- include/grub/arm/linux.h | 2 +- include/grub/arm64/linux.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename grub-core/loader/{arm64 => efi}/linux.c (99%) 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 99% rename from grub-core/loader/arm64/linux.c rename to grub-core/loader/efi/linux.c index 9e282b666..7c71d0336 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/efi/linux.c @@ -58,7 +58,7 @@ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh) struct grub_pe32_coff_header *coff_header; struct grub_pe32_optional_header *optional_header; - if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE) + if (lh->magic != GRUB_LINUX_ARCH_MAGIC_SIGNATURE) return grub_error(GRUB_ERR_BAD_OS, "invalid magic number"); if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC) diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h index bcd5a7eb1..8c13978d2 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -35,7 +35,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 7e22b4ab6..effd870ef 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -39,7 +39,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.31.1