From patchwork Tue Nov 3 08:55:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Wei Fu X-Patchwork-Id: 55922 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp1716882lbr; Tue, 3 Nov 2015 00:56:39 -0800 (PST) X-Received: by 10.140.106.7 with SMTP id d7mr35017868qgf.98.1446540999113; Tue, 03 Nov 2015 00:56:39 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 41si21584247qgt.67.2015.11.03.00.56.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 03 Nov 2015 00:56:39 -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; 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 Received: from localhost ([::1]:46448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtXOQ-00059A-NQ for patch@linaro.org; Tue, 03 Nov 2015 03:56:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtXOD-000594-A3 for grub-devel@gnu.org; Tue, 03 Nov 2015 03:56:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtXOA-0005ly-3B for grub-devel@gnu.org; Tue, 03 Nov 2015 03:56:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtXO9-0005lh-UW for grub-devel@gnu.org; Tue, 03 Nov 2015 03:56:22 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id BB6E38F519; Tue, 3 Nov 2015 08:56:20 +0000 (UTC) Received: from magi-f22.redhat.com (vpn1-5-165.pek2.redhat.com [10.72.5.165]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tA38uCFQ018905; Tue, 3 Nov 2015 03:56:13 -0500 From: fu.wei@linaro.org To: grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Subject: [PATCH] arm64: Fix the bug in fdt module Date: Tue, 3 Nov 2015 16:55:59 +0800 Message-Id: <1446540959-11825-1-git-send-email-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: xen-devel@lists.xensource.com, Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com, jcm@redhat.com, leif.lindholm@linaro.org, ryan.harkin@linaro.org, linaro-uefi@lists.linaro.org, Fu Wei X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: grub-devel-bounces+patch=linaro.org@gnu.org From: Fu Wei This patch goes with commit: 4d0cb755387d6f109b901386ed4d3d475df239fe arm64: Move FDT functions to separate module linux and xen_boot modules can't work without this patch. Signed-off-by: Fu Wei --- grub-core/Makefile.core.def | 1 + grub-core/loader/arm64/fdt.c | 5 +++++ 2 files changed, 6 insertions(+) -- 2.4.3 _______________________________________________ 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 2ef10d1..3ea4e49 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1674,6 +1674,7 @@ module = { module = { name = fdt; arm64 = loader/arm64/fdt.c; + fdt = lib/fdt.c; enable = arm64; }; diff --git a/grub-core/loader/arm64/fdt.c b/grub-core/loader/arm64/fdt.c index 5202c14..d160ca0 100644 --- a/grub-core/loader/arm64/fdt.c +++ b/grub-core/loader/arm64/fdt.c @@ -25,6 +25,10 @@ #include #include +GRUB_MOD_LICENSE ("GPLv3+"); + +static grub_dl_t my_mod; + static void *loaded_fdt; static void *fdt; @@ -177,6 +181,7 @@ GRUB_MOD_INIT (fdt) cmd_devicetree = grub_register_command ("devicetree", grub_cmd_devicetree, 0, N_("Load DTB file.")); + my_mod = mod; } GRUB_MOD_FINI (fdt)