From patchwork Thu Feb 1 18:18:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 126571 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1952714ljc; Thu, 1 Feb 2018 10:22:51 -0800 (PST) X-Google-Smtp-Source: AH8x224Ta0A2ex08ZzuHhb5n6iE8A46qm1+BVL/V0lHdkr2WVADh1vNYcyDttsQ5MJWi1wvthNtr X-Received: by 10.13.249.129 with SMTP id j123mr20672250ywf.51.1517509370981; Thu, 01 Feb 2018 10:22:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517509370; cv=none; d=google.com; s=arc-20160816; b=08s3xRMzOxPW5BIEE0+mIRa0XoSCYek5RMwtt+MajaDOYqUhT+kzd58O9rLWEUXESz itgeg6+aAnJv4yKLAodKSp5DPhuKWWFv5EXQgm29nLXqOL0v4slMI8u8DypKmO/kWK83 e65+4N6DTh/+gTiEi9rZkIiYQFfC2SWiedOB6h2TVU/0LhHhkzh8iX5lj+k6z7k0L0o7 BEklXifM8nc2dL9durNdxVefayYhavhc5K+FeUgnBvpRQj7Ji38ofxtr+ECbS6thZ+OT I6FnTZ7AdJ1T1bfrSL9pqO97VZ2PvFUZyMP3wUOovdGkxz7NQOgEAfnkMcmR9/l8ayWH 5Xig== 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=iBwlRsR751ehXTjpP9+0Jg03mBNbYJRq1JlLxGjPP+s=; b=QkuJK0m9DLuICOrhuunrYf9k8JF0fycQePSJADF9Ru66djdx751hVeYh7n1VwTsUfj Wswg2sijxpeUxwpQ1VUtz8agqvivmI1T/uySqeT1LL/NPPeWleNuoTN7SPCZHHKISsJL UAhClRUiDVWmjKsYypFwrmd8LRkVbuo1GqI+kdqeqz1EFSRd4+m9JWzusLG6BiYMBWry rVifv+nlKTjG9MuLg1UlKdr8Oo4vqbwUdcWc1zNtvmfnt1VCkJLpwY3PlzkZUD9spEZr M5uSorMz6AfupIfp2YxlUh9VMju24z/LHHeW6PI4ctnCdOgrEog7mEXihIBKipDNZN1O jMJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=N4Et/OxR; 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 n11si39556ywi.88.2018.02.01.10.22.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:22:50 -0800 (PST) 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.s=google header.b=N4Et/OxR; 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]:52807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJVa-0005vN-DT for patch@linaro.org; Thu, 01 Feb 2018 13:22:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJS5-0003oe-BF for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJS4-0003Yh-En for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:13 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:38229) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJS4-0003Wc-7y for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:12 -0500 Received: by mail-wm0-x242.google.com with SMTP id 141so7503224wme.3 for ; Thu, 01 Feb 2018 10:19:12 -0800 (PST) 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=1qo2PxeKmlnle2oiz3Y+7j083YUq+FRlrTd1NP0gzMY=; b=N4Et/OxRo2vUJPEc/v+vmvAb+FAsuGnGSK8js76ZHc7fJ5hL7WiHLfSQtbuNezDUfa 6MwECy9YVu6z8ER7UsFeENyNnI1AaReKJMTYZr3ThGeG+QRopCU8UerEj5FY+s1U0XDR +E0oc9+Qu8MujZDmNMiPxt7XS4qLt7jQSvWVA= 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=1qo2PxeKmlnle2oiz3Y+7j083YUq+FRlrTd1NP0gzMY=; b=p6NSns2dq80vjpztZrqKvnwrNifFlsc8gIW1gRb/2BjAKSZ0P2etjKjYf8pIYtmHgl hnpVcZ314WBZffUR1wr23s/L8nLJRsI57QgOt5jv4BZ3J6xdlO0RRoxcpZ8RxjhZ864B n0feyBo7qiD8fVwoyBSzbktI0Zp5QgJV5tP7y5wlg7gcpk3it+yDkSJpDlTmwqmGN3Tf WhCc0KeMoKCumbPwz99tr35R5yCRj606Fusm8Hnx2kvQWABVyNlZaFgku8vyb+bBWvPM txjkSBcW8/bj+A0Gu0tk+5ZSZeNBfJMsOa4kn+o50hxThAzdJCfXZ6MwqiR9ny/apVqo 8sxQ== X-Gm-Message-State: AKwxyteDc2yEEjqCmBQIoQF96F8sHkCSivQMXVMYpFECqimgX15L5WT0 2jSuI679iV8tOZ+SI8nLR1FjT3GqQRI= X-Received: by 10.28.182.5 with SMTP id g5mr26325828wmf.44.1517509150464; Thu, 01 Feb 2018 10:19:10 -0800 (PST) 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 b11sm163911wrf.23.2018.02.01.10.19.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:19:08 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 06/10] arm64: align linux kernel magic macro naming with i386 Date: Thu, 1 Feb 2018 18:18:54 +0000 Message-Id: <20180201181858.1472-7-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201181858.1472-1-leif.lindholm@linaro.org> References: <20180201181858.1472-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:c09::242 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" Change GRUB_ARM64_LINUX_MAGIC to GRUB_LINUX_ARM64_MAGIC_SIGNATURE. Signed-off-by: Leif Lindholm --- grub-core/loader/arm64/linux.c | 2 +- include/grub/arm64/linux.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel Reviewed-by: Daniel Kiper diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 79f25a711..ebe1e730d 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -50,7 +50,7 @@ static grub_addr_t initrd_end; grub_err_t grub_arm64_uefi_check_image (struct linux_arm64_kernel_header * lh) { - if (lh->magic != GRUB_ARM64_LINUX_MAGIC) + if (lh->magic != GRUB_LINUX_ARM64_MAGIC_SIGNATURE) return grub_error(GRUB_ERR_BAD_OS, "invalid magic number"); if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC) diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h index abe7e9cc3..b06347624 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -21,7 +21,7 @@ #include -#define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ +#define GRUB_LINUX_ARM64_MAGIC_SIGNATURE 0x644d5241 /* 'ARM\x64' */ /* From linux/Documentation/arm64/booting.txt */ struct linux_arm64_kernel_header