From patchwork Thu Sep 8 14:51:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Burton X-Patchwork-Id: 667740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sVSXQ179zz9s2Q for ; Fri, 9 Sep 2016 03:49:58 +1000 (AEST) Received: from localhost ([::1]:50053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi3SU-0006g4-OP for incoming@patchwork.ozlabs.org; Thu, 08 Sep 2016 13:49:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi0i3-000166-MI for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:53:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bi0i0-0000m7-2j for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:53:46 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:34115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi0hz-0000lk-SY for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:53:43 -0400 Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Forcepoint Email with ESMTPS id E31E0D140B1B7; Thu, 8 Sep 2016 15:53:28 +0100 (IST) Received: from localhost (10.100.200.230) by HHMAIL01.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Thu, 8 Sep 2016 15:53:32 +0100 From: Paul Burton To: , Aurelien Jarno , Leon Alrae Date: Thu, 8 Sep 2016 15:51:55 +0100 Message-ID: <20160908145158.30720-6-paul.burton@imgtec.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160908145158.30720-1-paul.burton@imgtec.com> References: <20160908145158.30720-1-paul.burton@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.100.200.230] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Subject: [Qemu-devel] [PATCH v2 5/8] dtc: Update requirement to v1.4.2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Burton Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In order to obtain fdt_first_subnode & fdt_next_subnode symbols from libfdt for use by a later patch, bump the requirement for dtc to v1.4.2 & the submodule to that same version. Signed-off-by: Paul Burton --- This will rely upon the dtc v1.4.2 tag being pushed to the dtc repository on git.qemu.org. Changes in v2: - New patch --- configure | 6 +++--- dtc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 5a9bda1..1c4e117 100755 --- a/configure +++ b/configure @@ -3326,11 +3326,11 @@ fi if test "$fdt" != "no" ; then fdt_libs="-lfdt" # explicitly check for libfdt_env.h as it is missing in some stable installs - # and test for required functions to make sure we are on a version >= 1.4.0 + # and test for required functions to make sure we are on a version >= 1.4.2 cat > $TMPC << EOF #include #include -int main(void) { fdt_get_property_by_offset(0, 0, 0); return 0; } +int main(void) { fdt_first_subnode(0, 0); return 0; } EOF if compile_prog "" "$fdt_libs" ; then # system DTC is good - use it @@ -3348,7 +3348,7 @@ EOF fdt_libs="-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs" elif test "$fdt" = "yes" ; then # have neither and want - prompt for system/submodule install - error_exit "DTC (libfdt) version >= 1.4.0 not present. Your options:" \ + error_exit "DTC (libfdt) version >= 1.4.2 not present. Your options:" \ " (1) Preferred: Install the DTC (libfdt) devel package" \ " (2) Fetch the DTC submodule, using:" \ " git submodule update --init dtc" diff --git a/dtc b/dtc index 65cc4d2..ec02b34 160000 --- a/dtc +++ b/dtc @@ -1 +1 @@ -Subproject commit 65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf +Subproject commit ec02b34c05be04f249ffaaca4b666f5246877dea