From patchwork Thu Aug 3 10:04:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 109311 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp573572qge; Thu, 3 Aug 2017 03:10:39 -0700 (PDT) X-Received: by 10.55.110.133 with SMTP id j127mr1704049qkc.92.1501755039086; Thu, 03 Aug 2017 03:10:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501755039; cv=none; d=google.com; s=arc-20160816; b=mSSDrcXyxDCJkFK+2QsgHkYLhoD+uvzf4ckyv9F9jO3KX4DP1k9ZUlRGFmWuyqmk65 bgrDba0J4KY16eet53hdKjmWpeGkqg+w51E8pIsbGLFAQsDVYXO4W1EEh3D0tMeYElZW u/pxL/fvQvEmMRD8gGBNQuT/8JFx422sOKhKGSurwOU7Jp1/FRoIcagxNVSieiGvpQ1P bmQu29gYRlIxEobr4giSXKXJoqVjlTSRAo4gIVLy3v+kAkZz1i8MkBJW3fZRhAxh4NkF 1nH0pPN/Nm+3THaRdbiAJBTF0EaoNYlGtpb51a4aPNnZq8KQfDeIiDD1daUF/wXMEoVf d8yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:arc-authentication-results; bh=1fUujW+SBWy/EwH25MFgc9gvD//NPEUZk7zdwX0mJgw=; b=JvN7kbfTT5SVpRQtBFrztz+bqFO8dkD8FQGCSQEnasYxZcqyoP9tf5yXZxo813UEv6 QD8SPo9qHw56CFaJTHQKk3sRnbAIkBpfu0GNe3L7YYfiY426YsnVzuBEEObR6ZaGT4QN wBXGX/u3SHQCz8jV0H8WwHo/h/e9x4CdfAk62lH+RifDTlUmHBIrSXloXfVqXSw8/YZn dRfAurCs477D/LJcQB+Iz7Fm9LFtLq+OenJ8+muAKgqcgDwDgbyX5quz/9VhJJnwizSs xqNyVN7/88nJ26np626K+nD/OIrQhWpzlJGILyUPD0QzF4VCL//y0Z7B2hNtz2Yqeehi nFsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=YJvpXVHQ; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=grub-devel-bounces+patch=linaro.org@gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k36si12516482qtd.514.2017.08.03.03.10.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 03 Aug 2017 03:10:39 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=YJvpXVHQ; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=grub-devel-bounces+patch=linaro.org@gnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddD5Q-0002rp-1V for patch@linaro.org; Thu, 03 Aug 2017 06:10:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddD1i-0000Ju-Hh for grub-devel@gnu.org; Thu, 03 Aug 2017 06:06:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddD1h-0004EI-NH for grub-devel@gnu.org; Thu, 03 Aug 2017 06:06:46 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:36535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddD1h-0004Dh-H6 for grub-devel@gnu.org; Thu, 03 Aug 2017 06:06:45 -0400 Received: by mail-wr0-x236.google.com with SMTP id y43so3723886wrd.3 for ; Thu, 03 Aug 2017 03:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=58mA3uyGQCjrRPlUVOJJLQnKBmkW0EW+R9L8ckGfQ/M=; b=YJvpXVHQLj9h/QggcO4FCU5irTLBZI33vBjSlctH3/WDXcEOysJbcZcpZz7hH5AAJv qW5eo4jsC35nw+Lb/HH0EF3qfl4dIoETude++aE1YoDPaV3b8KFXNb0Khq8xNDmUDzD4 sPxOzp7RI64MKE4SRuwfUJFV24VCfcqwcCEKU= 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; bh=58mA3uyGQCjrRPlUVOJJLQnKBmkW0EW+R9L8ckGfQ/M=; b=Keq7Ni6YdBSIrcOmO8SlzNqhYQksJE7YvcQB1xPidKP+gL4kRqjoO3QOoVl25mKv2f GdJESxQwsxd3oVhfcHAfuL5RtQwH1IUMCGIHb5yxrjQhHY9S7lNowcVXL2auO0V7L8er Kflmg0Gh1sg7V/28GZsykn1+pEQUvZfR+3ULQPjaj1ZzeOKL6wKxHXO/lIG8fa1c3mIg w2dLPQXirqkMPQN5UazTh/WkEk34TMn2F1cBZws0+hJGkN22SC5dJ5e10/LjUMM0iTw7 VOc5B5rpdg2M9tS5firnuclqf/VttTRidwboewy9rMk8fnNUxE+CGxfipp3aXRGnxaKm FMDA== X-Gm-Message-State: AHYfb5inmFdQleRmv8B82hS4aM2L4IvgQWQXTFtFe4i3PGZyVIvioaol YtrroBC+AcLQy6JViCCoFg== X-Received: by 10.223.147.164 with SMTP id 33mr980976wrp.107.1501754804375; Thu, 03 Aug 2017 03:06:44 -0700 (PDT) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id e5sm2274543wre.24.2017.08.03.03.06.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 03:06:43 -0700 (PDT) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH v2 11/14] arm/efi: switch to arm64 linux loader Date: Thu, 3 Aug 2017 11:04:29 +0100 Message-Id: <20170803100432.29913-12-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170803100432.29913-1-leif.lindholm@linaro.org> References: <20170803100432.29913-1-leif.lindholm@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::236 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Cc: Daniel Kiper MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" Switch over to the EFI-stub aware arm64 loader for 32-bit ARM platforms. Signed-off-by: Leif Lindholm --- grub-core/Makefile.core.def | 6 +++--- grub-core/kern/efi/mm.c | 2 +- include/grub/efi/efi.h | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index a65c27f7f..87f80d316 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -229,7 +229,6 @@ kernel = { ia64_efi = kern/ia64/cache.c; arm_efi = kern/arm/efi/init.c; - arm_efi = kern/arm/efi/misc.c; arm_efi = kern/efi/fdt.c; arm64_efi = kern/arm64/efi/init.c; @@ -1698,7 +1697,8 @@ module = { powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c; sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c; ia64_efi = loader/ia64/efi/linux.c; - arm = loader/arm/linux.c; + arm_uboot = loader/arm/linux.c; + arm_efi = loader/arm64/linux.c; arm64 = loader/arm64/linux.c; common = loader/linux.c; common = lib/cmdline.c; @@ -1707,7 +1707,7 @@ module = { module = { name = fdt; - arm64 = loader/efi/fdt.c; + efi = loader/efi/fdt.c; common = lib/fdt.c; enable = fdt; }; diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c index 1e62eff8f..c8fffe902 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -572,7 +572,7 @@ grub_efi_mm_init (void) 2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE)); } -#if defined (__aarch64__) +#if defined (__aarch64__) || defined (__arm__) grub_err_t grub_efi_get_ram_base(grub_addr_t *base_addr) { diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h index 149969941..ec691bd44 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -89,8 +89,6 @@ extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd, #if defined(__arm__) || defined(__aarch64__) void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void); -#endif -#if defined(__aarch64__) grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *); #include grub_err_t grub_efi_linux_check_image(struct grub_linux_kernel_header *lh);