From patchwork Tue Jun 16 12:53:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 188028 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3624338ilo; Tue, 16 Jun 2020 05:57:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+M+zanct4XvQldpDDd4I1SzfAlnOxnkvbTC01+1q73XQO0dcHRi2fQQwR86fFg+/l+PMW X-Received: by 2002:a25:60c5:: with SMTP id u188mr3849808ybb.268.1592312263503; Tue, 16 Jun 2020 05:57:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592312263; cv=none; d=google.com; s=arc-20160816; b=htqNBGtacuX8X86KAA8LSPmLyAe31s89Zee4s1ZexxJHGc6lQKeW9HTHfaBlsKha2V sDml61D1t8PLa5Zn0jzfsuUoBKVITKLOzW+aei8P/TTsTYN9F0dMwKW4YdzkrNAuuuK/ 9+oEL88JX2M3nI9U0+8GufFaZuSpD2sifTh3D0w69eTTiA2wrD9z7ex0OwFX4pCczkIR Q2UO/zl1em7lRUgq47o2GRm9FJQWtZQM66iqaoOhGaw7r88RwM3XlvQJq0yG5hgVJt7l uyx9c8avT88oemR3q3dY2gbG8vifYie76J7jdbIAofDtQ9U+UKf9CUTgK2QjpLNJGds4 O+Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=3KvyAfRcofuRLNj4oNNcFUoLgTecr2giSski/lyf7H4=; b=tlO7GuuSzb7NTWrIv5KcC84+W3uqrsWVkvj2lQzau7QaTUWlbplK8gEEn3NKCe1alz t1RfttO2cvv4sskI7yckDvrp7QXa0KKvc0P8seAhEtmjPrlbN2NpvMStMaHQUF9Uz9aR VYh2PWUEkdv5g9xb/geOQRSQfgib+Gc2+D4lH6n8UAyXeeofOslyisDcJ5X1hzAotUfV TP+fvoBDB7LHlKpjbJz3qmITee0pD8hsmyYbuFlkjyvEwH1bx+KBzmUvurGQxD+YDotL E0I44wufvU+BsvXgFJeGG4AGEA47Hd5te0ao4OvP7s4eKxyR7MqB0gAjKvWz8/Jlrd1e IejQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=W1M6nEko; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a5si15837661ybg.97.2020.06.16.05.57.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jun 2020 05:57:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=W1M6nEko; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlB9q-0002MT-UV for patch@linaro.org; Tue, 16 Jun 2020 08:57:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlB5q-0003iQ-T7 for qemu-devel@nongnu.org; Tue, 16 Jun 2020 08:53:34 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:43215) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlB5n-00005P-Gc for qemu-devel@nongnu.org; Tue, 16 Jun 2020 08:53:34 -0400 Received: by mail-wr1-x42a.google.com with SMTP id l10so20620815wrr.10 for ; Tue, 16 Jun 2020 05:53:29 -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 :mime-version:content-transfer-encoding; bh=3KvyAfRcofuRLNj4oNNcFUoLgTecr2giSski/lyf7H4=; b=W1M6nEkohGCl+xddylcn+tl9y4BEJHcjxXoa0yR20DlLrb5Q1YzHKThse8T2QvbXgM dCxmbJqpDAKOru58olIg1cRlow6Bf/Kt4Jdb/90DkAN5XGvQ+UrsUt5CTy9hPaGbcgoJ A7KsuYeyPy4mrFJxMroM5Bp1XhspWaKu9Xz5iXWfRF9C13dH4nBIuqSdZjBrhJsgHC9y AypSo75qxWJE042//oc5L7U8cq34WVm/vM6kE27S8Y58VqVfomsD3TxkbJFGOHXYFkeZ HyYah1QT+XzLjlfGLELBwUxNNL3c5vREcTbDKtfZjtNjVKrz/qJc8heiwrZq7bKNKWmY /0Pw== 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:mime-version:content-transfer-encoding; bh=3KvyAfRcofuRLNj4oNNcFUoLgTecr2giSski/lyf7H4=; b=K0V6/aAE/vzbzI3MBFFqt5SY6u4fz5xlqcZdR1MVZkOgMTrc8gZYWYTG/hT98m3EAK ChIf7Bt+8hbiHrw4DJCUMm6u9QTKkdohITNreBzBSx4H0yKBQ/gAPBkpY7NFB7cHxyhx kGNndjsw3QQY6YA3PkPnNNtfTRsuXQ8foswjiEmdOSAhOSirLBKFVfB8qZCXwvfLup55 JrUTxOIcKlPVsbYTBMl/tr9c06Ksq5uxlUYob08gO1G9ZdFRHE31KCXUQxItvHQkm7vz uCKShN1OQsk2r/BdwwBV6kqRgCkAR53BBhBvshsO/pAX8kZ2GWG6Tr4jlZmx258L1JKD 2wYg== X-Gm-Message-State: AOAM530yk2UeynfsSeavtaSsp2eYbyb+lhrCmbjiOYYUKPsex0zlldiV R5tuh/YXTU0M9dRbH6AKPp5fEw== X-Received: by 2002:adf:ed51:: with SMTP id u17mr2735068wro.285.1592312008273; Tue, 16 Jun 2020 05:53:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p16sm31603816wru.27.2020.06.16.05.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 05:53:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 75A7E1FF8C; Tue, 16 Jun 2020 13:53:24 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/21] Makefile: dtc: update, build the libfdt target Date: Tue, 16 Jun 2020 13:53:05 +0100 Message-Id: <20200616125324.19045-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200616125324.19045-1-alex.bennee@linaro.org> References: <20200616125324.19045-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Claudio Fontana Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Claudio Fontana dtc submodule update, now call the libfdt target from the new dtc Makefile, which has been changed to not require bison, flex, etc. This removes warnings during the build. scripts/ symlink and tests directory creation are not necessary, and neither is calling the clean rule explicitly. Signed-off-by: Claudio Fontana Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20200518160319.18861-2-cfontana@suse.de> Message-Id: <20200612190237.30436-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index 89867a17208..8a9f544b0b7 100755 --- a/configure +++ b/configure @@ -4312,7 +4312,6 @@ EOF mkdir -p dtc if [ "$pwd_is_source_path" != "y" ] ; then symlink "$source_path/dtc/Makefile" "dtc/Makefile" - symlink "$source_path/dtc/scripts" "dtc/scripts" fi fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt" fdt_ldflags="-L\$(BUILD_DIR)/dtc/libfdt" diff --git a/Makefile b/Makefile index ed0ed93b2d6..895410fbf9c 100644 --- a/Makefile +++ b/Makefile @@ -526,13 +526,14 @@ $(SOFTMMU_FUZZ_RULES): $(edk2-decompressed) $(TARGET_DIRS_RULES): $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),) -DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt +# LIBFDT_lib="": avoid breaking existing trees with objects requiring -fPIC +DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_lib="" DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) -DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt +DTC_CPPFLAGS=-I$(SRC_PATH)/dtc/libfdt .PHONY: dtc/all -dtc/all: .git-submodule-status dtc/libfdt dtc/tests - $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,) +dtc/all: .git-submodule-status dtc/libfdt + $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt,) dtc/%: .git-submodule-status @mkdir -p $@ @@ -820,7 +821,6 @@ distclean: clean rm -rf $$d || exit 1 ; \ done rm -Rf .sdk - if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \ ar de en-us fi fr-be hr it lv nl pl ru th \ diff --git a/dtc b/dtc index 88f18909db7..85e5d839847 160000 --- a/dtc +++ b/dtc @@ -1 +1 @@ -Subproject commit 88f18909db731a627456f26d779445f84e449536 +Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647