From patchwork Thu Aug 3 10:04:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 109308 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp572485qge; Thu, 3 Aug 2017 03:09:33 -0700 (PDT) X-Received: by 10.237.53.83 with SMTP id b19mr1275786qte.312.1501754973040; Thu, 03 Aug 2017 03:09:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501754973; cv=none; d=google.com; s=arc-20160816; b=RBwtHwhwH4tML46q2JmuGvWUWHX82uamjrpbHDBeIDf9LMvQSQUfvEpL0JmrrwpI9A KODnYA8U1URsQNAKmS45a/QJ/FPaVjBBOUbPToik7Qg7OK3QCLjDVM1VBGHoyPLKqwZp u11ABgW8Q2ZArLwY3Eat/j10i4ao6eWommOo5Ux0ZRQ9PzEhJzI6E5b581N/BN1eOveg i0og533BjYTeL2oXyLXV2Hf8LCadeCQzXmX5SXYJgfWE/uarZlQvvMOgu/NqIv3xcdJP NdBELgw7itbhzmY1OhTO68prA+z6KWEb7u01naORBN6BzejaDrrKXuBnQejR3QW3AoFK CwSA== 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=jTam3tkLGxCMlCsFQXIsfRxcVj27SX/eKBCjceId+ow=; b=VNu1fk5r13BFMm0Wecj8KNMLOUd6sPoXaPvTC/DyhbW5qLMnHRpyvYlZ7uGrkt8v+l BAYV2C15OPh3SzRgojsUpUb+V3UQeq83tPaXf6SwB7puqgfWdPdi5zb1f+gCDk5lm90z f7ZyDDdMOgQpRxDtpv2NrQNXN4VSvDkd6OJRMUv6hGbdWKH731/c0ZrAywkJMJRE7lcC m8iH1Rsl2fZmX+/yWuZzZwK1PAO4QfCbgnLYXUiDUc+EcTIYkgKQoP5Ick2aXFIMaXRW o7Tr1htuOUkji4RiFx7XmeCp9kvqcL6WB1hVcyT5TQ3g5begrRQiQrZfDlNoxvlGMDvD hSxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=LijFimWn; 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 s63si12323415qkc.312.2017.08.03.03.09.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 03 Aug 2017 03:09:33 -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=LijFimWn; 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]:53219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddD4M-0002e4-9b for patch@linaro.org; Thu, 03 Aug 2017 06:09:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddD1f-0000Fi-AQ for grub-devel@gnu.org; Thu, 03 Aug 2017 06:06:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddD1d-0004A3-Q0 for grub-devel@gnu.org; Thu, 03 Aug 2017 06:06:43 -0400 Received: from mail-wr0-x22e.google.com ([2a00:1450:400c:c0c::22e]:33932) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddD1d-000494-JE for grub-devel@gnu.org; Thu, 03 Aug 2017 06:06:41 -0400 Received: by mail-wr0-x22e.google.com with SMTP id 12so3743068wrb.1 for ; Thu, 03 Aug 2017 03:06:41 -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=zE8XQXD9Tg876JfUbF5mv2XKGvY2cG2l2k7hIDqe+94=; b=LijFimWnWRK/KxVTHpZwHI2q98wrx9LsB8LEWqYGuW0KdFvNtQ2MQAop/VJ1NSVz2J r18DkZbD9vHdef9GTpL7NaKn+GRtxObP3x68T8zG3Rl4Dg7qyzRv67Pw/BCMzPRphgDV q4v9y7qatmRqQhEftJWHpOPz0tbLYyzJFVGSc= 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=zE8XQXD9Tg876JfUbF5mv2XKGvY2cG2l2k7hIDqe+94=; b=VHW6IxTxNuSJJpVhE+70/eo50TseSiuFkF65L3xMTkJBG7HFjxgEc0LxCSFDf8CfFX LCAR6IoirLynpR1O7whqBpU/B6kCcL0R0olEzcL1eAnE1nsELEIQZrOLH5rY1XddFMGG /XFvEHYQ4s7saZbdcnZe/tBSrZiXQgGbzhY0Pnj97m6QCDALuR4PVJHnBxAslb2s+sPh ZHpw3e/8Ybb6rNgHjKAWe0DErEebjGCI7+CRicT/Nte6N3JXcoDMRrtoqBpG/Goi0SvM aFY5l6eX4heoHfWyD12Bc8rqCvCiOLRXJBIg1NwHbVHHNU20kWH3wm6zrL5LABctSGIE qDow== X-Gm-Message-State: AIVw112W2SLLqE4V0HuX81xMnXOhK4TpYfV4ixRMxA4IlAj5hx3SEBL0 NYaHWYLl7FciJwd5OOOhrg== X-Received: by 10.223.157.7 with SMTP id k7mr851258wre.43.1501754800301; Thu, 03 Aug 2017 03:06:40 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2017 03:06:39 -0700 (PDT) From: Leif Lindholm To: grub-devel@gnu.org Subject: [PATCH v2 06/14] efi: move fdt helper library Date: Thu, 3 Aug 2017 11:04:24 +0100 Message-Id: <20170803100432.29913-7-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::22e 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" There is nothing ARM64 (or even ARM) specific about the efi fdt helper library, which is used for locating or overriding a firmware-provided devicetree in a UEFI system - so move it to loader/efi for reuse. Move the fdtload.h include file to grub/efi and update path to efi/fdtload.h in source code referring to it. Signed-off-by: Leif Lindholm --- grub-core/Makefile.core.def | 2 +- grub-core/loader/arm64/linux.c | 2 +- grub-core/loader/arm64/xen_boot.c | 2 +- grub-core/loader/{arm64 => efi}/fdt.c | 2 +- include/grub/{arm64 => efi}/fdtload.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename grub-core/loader/{arm64 => efi}/fdt.c (99%) rename include/grub/{arm64 => efi}/fdtload.h (100%) -- 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 1d86bd22e..a65c27f7f 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1707,7 +1707,7 @@ module = { module = { name = fdt; - arm64 = loader/arm64/fdt.c; + arm64 = loader/efi/fdt.c; common = lib/fdt.c; enable = fdt; }; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c index 1960d18b5..cac94d53d 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c index b7a5b17c9..d092a53ed 100644 --- a/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c @@ -27,9 +27,9 @@ #include #include #include -#include #include #include +#include #include #include /* required by struct xen_hypervisor_header */ #include diff --git a/grub-core/loader/arm64/fdt.c b/grub-core/loader/efi/fdt.c similarity index 99% rename from grub-core/loader/arm64/fdt.c rename to grub-core/loader/efi/fdt.c index bdc3a0c1f..9715afee0 100644 --- a/grub-core/loader/arm64/fdt.c +++ b/grub-core/loader/efi/fdt.c @@ -18,12 +18,12 @@ #include #include -#include #include #include #include #include #include +#include #include static void *loaded_fdt; diff --git a/include/grub/arm64/fdtload.h b/include/grub/efi/fdtload.h similarity index 100% rename from include/grub/arm64/fdtload.h rename to include/grub/efi/fdtload.h