From patchwork Thu Feb 1 18:18:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 126568 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp1951833ljc; Thu, 1 Feb 2018 10:21:44 -0800 (PST) X-Google-Smtp-Source: AH8x224NwtA1PL6giDyTsOqg+GaUTH3lyJXVw+X+dJIXsgmaCczNEbLHYd4T+RU/meEOVgV4o0er X-Received: by 10.37.205.197 with SMTP id d188mr11288088ybf.244.1517509304817; Thu, 01 Feb 2018 10:21:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517509304; cv=none; d=google.com; s=arc-20160816; b=rUxemVzfJEG0gfj8lBf5UdC4bWgUe5DU8QCw4eZYpFdk5r5aLhTMh96v8YxvYyQ6qZ oi8scv8aM08dZCy76wXyDgm4wA6+VfbrbvW3CNjaKe98gXeo/eba52WLFYvvfeFuU7gX /jLfkfeiGZqE7Tl7jED4DsRPDQX2RVZX7NW1PpuQMrbeQW7L+YsbsjthKrBJMOw0OwXC K3eyXx3YOEfm6SiW7uJvySOMETTk9ELojNnETv9JyfI+ODi8Tfgn+zjOZldXYF1ATycI fjsSrZubsCVI787fsIIszf5JLlYhXA4xg9lqvgs7EMkR+6XtthVSaQVRjqQha5EP4TkN FytA== 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=eaRrkyVXHp9AjDXcQUMKzZQD8N/a+R+I2rN1xV+VKXw=; b=heUYkq+IDx/0BtcQXlxcapZkP1soHAUcbxoQv4m8CtNqI/iYwQsxUdxinEM/CEGlb+ e2cePi0lE3Es8BbG+DHIjbr5emlN9Kma7ClI1LwsycOy6mO4TmYB3cEl40jn/r5+l7l6 u6mOD0XCDY0fM4XM2JBLkCwT8dHS0yEl70M+PJYZyDYc8zKC8sMOSkefkSLQ+kV/oIfT Pz9eqMV7KNbEkMOYeWHkqi76z5qHO99uTf2AR01qITXBpRb+DOhjuAYfl8ZhfNBdxlpd 5klHRMfEnpzzqJEl0goAyEci05UskojrpSZJS8AuwvbEBFCAfLap74vvgnTY9OCElVNF xi0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DnO1Y0qh; 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 c6si35650ywm.233.2018.02.01.10.21.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 10:21:44 -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=DnO1Y0qh; 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]:52729 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJUW-0004vN-3y for patch@linaro.org; Thu, 01 Feb 2018 13:21:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehJSA-0003u4-LU for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehJS6-0003f0-Q9 for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:18 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:41792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ehJS6-0003d2-Jo for grub-devel@gnu.org; Thu, 01 Feb 2018 13:19:14 -0500 Received: by mail-wr0-x241.google.com with SMTP id v15so20022606wrb.8 for ; Thu, 01 Feb 2018 10:19:14 -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=qXO1p/h5ZR0VKc/lR0DYW4tPwlPdukreY46jZ9hKKEE=; b=DnO1Y0qhN1rp8dRgcr9SmLtL/l9rNp8YlgW7T/K5vqAYsvUCvt4unwZND/w6IS6u3u IXNcm6eloChKroPW4B7WX24yE+lpw/rDXAyg+owzJm+0zoZR5g7DbYe48Mn2kYXmaa36 FUZUkIK7bo0EQFfQUmAaDis/29SFJ0g7UYPmw= 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=qXO1p/h5ZR0VKc/lR0DYW4tPwlPdukreY46jZ9hKKEE=; b=FB9zOjIGU3PvN2i9rFMGlgNssOjZHmCLfGaRNjXi9cudUSDjInCEI7zcrPlvjHLsx5 SrRVZny13c0wm33kThXnvjcAPtCHXmEb5V2g/rIwEE4hTIi8PzEux+AZkS4puQokOmYY iX35X+eCoqnRtpAKP4PF38BUIpUkj1RZ7FimPmPj1m9reen8xjsNGRxA7MTcQSp1SMUZ K56bsynTu7i8ONjOkxbwpdCQoXBFY0t3wsXoPvaD1an4Irwhb5/JCSq3S8d54vMWY+3i uCBY0ugJhh0TTAroWMXMH4vs4D1v7MiB4hAYnZQIoqMPLyqAsoNbY7wpkP2MBeEwNpg8 BFqQ== X-Gm-Message-State: AKwxyteK0jqMy2YyHW5DxueTE9xPxpp+i1hDGKf07bbtmIZ61VD/cBnH VrtXrHX2kgAEaInPEyC+N4EKPV8HCso= X-Received: by 10.223.157.200 with SMTP id q8mr7052766wre.205.1517509153357; Thu, 01 Feb 2018 10:19:13 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 10:19:11 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH 08/10] arm: make linux.h safe to include for non-native builds Date: Thu, 1 Feb 2018 18:18:56 +0000 Message-Id: <20180201181858.1472-9-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:c0c::241 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" (for machine arm/efi) and (for machine arm/coreboot) will not always resolve (and will likely not be valid to) if pulled in when building non-native commands, such as host tools or the "file" command. So explicitly include them with their expanded pathnames. Signed-off-by: Leif Lindholm --- include/grub/arm/linux.h | 4 ++-- 1 file 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/include/grub/arm/linux.h b/include/grub/arm/linux.h index 64dd3173c..cceb9c4a9 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -43,7 +43,7 @@ struct linux_arm_kernel_header { # define grub_arm_firmware_get_machine_type grub_uboot_get_machine_type #elif defined GRUB_MACHINE_EFI # include -# include +# include /* On UEFI platforms - load the images at the lowest available address not less than *_PHYS_OFFSET from the first available memory location. */ # define LINUX_PHYS_OFFSET (0x00008000) @@ -57,7 +57,7 @@ grub_arm_firmware_get_machine_type (void) } #elif defined (GRUB_MACHINE_COREBOOT) #include -#include +#include # define LINUX_ADDRESS (start_of_ram + 0x8000) # define LINUX_INITRD_ADDRESS (start_of_ram + 0x02000000) # define LINUX_FDT_ADDRESS (LINUX_INITRD_ADDRESS - 0x10000)