From patchwork Fri Jun 5 17:58:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 281244 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60915C433DF for ; Fri, 5 Jun 2020 18:01:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B4FB206FA for ; Fri, 5 Jun 2020 18:01:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ck4FK7bC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B4FB206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhGfE-0001AV-F9 for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 14:01:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhGcg-00062N-HU for qemu-devel@nongnu.org; Fri, 05 Jun 2020 13:59:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30392 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jhGcf-0000eg-Oi for qemu-devel@nongnu.org; Fri, 05 Jun 2020 13:59:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591379956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WgLubjKz8VmCZqpELU1JLw/uHIcEFx15X1H+hmJK3kA=; b=ck4FK7bC5OfqOEVmI1yRWfDBWPA0n+wWuhgjofz+p6xLzMuV3VN7y6O66JKBSvBk3402N9 cxxttkUQlSzlWOuqnjPBDvWp84RajhNaV6+uowQON8QR2Hj3xSs2gHBKWbkbgCB6irbN2C Mv5nkN7pIbAdV12InTCPQv7zCivJ/d4= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-iSafNz04Osii_NVpjihFQw-1; Fri, 05 Jun 2020 13:59:15 -0400 X-MC-Unique: iSafNz04Osii_NVpjihFQw-1 Received: by mail-wr1-f70.google.com with SMTP id c14so4046567wrw.11 for ; Fri, 05 Jun 2020 10:59:14 -0700 (PDT) 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=WgLubjKz8VmCZqpELU1JLw/uHIcEFx15X1H+hmJK3kA=; b=mebIz0gaA9lHg4Oi/prNcVDeQkJnn8IK8vF4nNi5eXIOKP51uyeF6GQ5ROBlWttXMP hV8jekzH+34q5nqNab/67C93ac33mj9TkiJ9XaoiUjxMnLICVdJWIZu1OzozQSnUm+uG MIjbP1W29dg1ZJ6jQ5eHJtqne8Zfniu9hgUq9Iu1G6HxZlgJJM/tJqyhyvALNeSGuQ6K P7VLROL9Yrdc+QzBOhef94RUrir0m8IAu/GLYvkEpCNRhxy11nrb1cpvyR2TZYYxDEhP r3QCV/QplZoGJ0tt4uAt3Jqt5eKm7sMljjfK0DUFdk122j8fU1ep8GrYSqx/NvFqnvL7 p+dQ== X-Gm-Message-State: AOAM533sefDF5o2BgvZom8MhlL3tRZtuW5o1L49ODMOYkCFwz92mzfzm L+MDFBDlA/SF4OE74XqhSxAmzfxhGU6HShnRuewtxJwKgQHjDJrSGN+uHL5uW+u1QkToSrutt/7 koqTZSkXyWr3Vvkg= X-Received: by 2002:a1c:9d96:: with SMTP id g144mr3708849wme.126.1591379953812; Fri, 05 Jun 2020 10:59:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/ujp0mrZ+FuQIpvB3JDuQmfgyTRwVcPY0wV1wWey7JzNt0+gtp8fo5g1uYUtJkf+Jez95/g== X-Received: by 2002:a1c:9d96:: with SMTP id g144mr3708839wme.126.1591379953656; Fri, 05 Jun 2020 10:59:13 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id s8sm13674175wrg.50.2020.06.05.10.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 10:59:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 10/11] Makefile: Allow target-specific optional Kconfig Date: Fri, 5 Jun 2020 19:58:20 +0200 Message-Id: <20200605175821.20926-11-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200605175821.20926-1-philmd@redhat.com> References: <20200605175821.20926-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 03:27:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Allow use of target-specific Kconfig file. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f8a45e1379..d5009cd304 100644 --- a/Makefile +++ b/Makefile @@ -423,11 +423,13 @@ MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \ $(SRC_PATH)/accel/Kconfig \ $(SRC_PATH)/hw/Kconfig MINIKCONF_DEPS = $(MINIKCONF_INPUTS) \ - $(wildcard $(SRC_PATH)/hw/*/Kconfig) + $(wildcard $(SRC_PATH)/hw/*/Kconfig) \ + $(wildcard $(SRC_PATH)/target/*/Kconfig) MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py $(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \ + $(wildcard $(SRC_PATH)/target/$(call base-arch, $(firstword $(subst -, ,$@)))/Kconfig) \ > $@.tmp, "GEN", "$@.tmp") $(call quiet-command, if test -f $@; then \ if cmp -s $@.old $@; then \