All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Fam Zheng" <fam@euphon.net>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	kvm@vger.kernel.org, "Alex Bennée" <alex.bennee@linaro.org>,
	qemu-arm@nongnu.org, "Richard Henderson" <rth@twiddle.net>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Claudio Fontana" <cfontana@suse.de>
Subject: [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig
Date: Wed, 30 Sep 2020 00:43:45 +0200	[thread overview]
Message-ID: <20200929224355.1224017-3-philmd@redhat.com> (raw)
In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com>

Extend the generic Meson script to pass optional target Kconfig
file to the minikconf script.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
We could use fs.exists() but is_file() is more specific
(can not be a directory).

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Claudio Fontana <cfontana@suse.de>
---
 meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index d36dd085b5..9ab5d514d7 100644
--- a/meson.build
+++ b/meson.build
@@ -529,6 +529,7 @@ kconfig_external_symbols = [
 ]
 ignored = ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS']
 
+fs = import('fs')
 foreach target : target_dirs
   config_target = keyval.load(meson.current_build_dir() / target / 'config-target.mak')
 
@@ -569,8 +570,13 @@ foreach target : target_dirs
     endforeach
 
     config_devices_mak = target + '-config-devices.mak'
+    target_kconfig = 'target' / config_target['TARGET_BASE_ARCH'] / 'Kconfig'
+    minikconf_input = ['default-configs' / target + '.mak', 'Kconfig']
+    if fs.is_file(target_kconfig)
+      minikconf_input += [target_kconfig]
+    endif
     config_devices_mak = configure_file(
-      input: ['default-configs' / target + '.mak', 'Kconfig'],
+      input: minikconf_input,
       output: config_devices_mak,
       depfile: config_devices_mak + '.d',
       capture: true,
-- 
2.26.2


WARNING: multiple messages have this Message-ID
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	kvm@vger.kernel.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	qemu-arm@nongnu.org, "Claudio Fontana" <cfontana@suse.de>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig
Date: Wed, 30 Sep 2020 00:43:45 +0200	[thread overview]
Message-ID: <20200929224355.1224017-3-philmd@redhat.com> (raw)
In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com>

Extend the generic Meson script to pass optional target Kconfig
file to the minikconf script.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
We could use fs.exists() but is_file() is more specific
(can not be a directory).

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Claudio Fontana <cfontana@suse.de>
---
 meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index d36dd085b5..9ab5d514d7 100644
--- a/meson.build
+++ b/meson.build
@@ -529,6 +529,7 @@ kconfig_external_symbols = [
 ]
 ignored = ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS']
 
+fs = import('fs')
 foreach target : target_dirs
   config_target = keyval.load(meson.current_build_dir() / target / 'config-target.mak')
 
@@ -569,8 +570,13 @@ foreach target : target_dirs
     endforeach
 
     config_devices_mak = target + '-config-devices.mak'
+    target_kconfig = 'target' / config_target['TARGET_BASE_ARCH'] / 'Kconfig'
+    minikconf_input = ['default-configs' / target + '.mak', 'Kconfig']
+    if fs.is_file(target_kconfig)
+      minikconf_input += [target_kconfig]
+    endif
     config_devices_mak = configure_file(
-      input: ['default-configs' / target + '.mak', 'Kconfig'],
+      input: minikconf_input,
       output: config_devices_mak,
       depfile: config_devices_mak + '.d',
       capture: true,
-- 
2.26.2



  parent reply	other threads:[~2020-09-29 22:44 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-29 22:43 [PATCH v4 00/12] Support disabling TCG on ARM (part 2) Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 01/12] accel/tcg: Add stub for cpu_loop_exit() Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-09-30  7:08   ` Thomas Huth
2020-09-30  7:08     ` Thomas Huth
2020-10-03  9:09   ` Richard Henderson
2020-10-03  9:09     ` Richard Henderson
2020-09-29 22:43 ` Philippe Mathieu-Daudé [this message]
2020-09-29 22:43   ` [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig Philippe Mathieu-Daudé
2020-09-30 12:50   ` Claudio Fontana
2020-09-30 12:50     ` Claudio Fontana
2020-09-30 13:17     ` Paolo Bonzini
2020-09-30 13:17       ` Paolo Bonzini
2020-10-03  9:13   ` Richard Henderson
2020-10-03  9:13     ` Richard Henderson
2020-10-03  9:15     ` Paolo Bonzini
2020-10-03  9:15       ` Paolo Bonzini
2020-10-03  9:32       ` Richard Henderson
2020-10-03  9:32         ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 03/12] target/arm: Select SEMIHOSTING if TCG is available Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-10-03  9:43   ` Richard Henderson
2020-10-03  9:43     ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 04/12] target/arm: Restrict ARMv4 cpus to TCG accel Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-09-30  8:03   ` Philippe Mathieu-Daudé
2020-09-30  8:03     ` Philippe Mathieu-Daudé
2020-10-03  9:17     ` Thomas Huth
2020-10-03  9:17       ` Thomas Huth
2020-09-29 22:43 ` [PATCH v4 05/12] target/arm: Restrict ARMv5 " Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 06/12] target/arm: Restrict ARMv6 " Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 07/12] target/arm: Restrict ARMv7 R-profile " Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 08/12] target/arm: Restrict ARMv7 M-profile " Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 09/12] target/arm: Make m_helper.c optional via CONFIG_ARM_V7M Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-10-03  9:48   ` Richard Henderson
2020-10-03  9:48     ` Richard Henderson
2021-01-29 18:53     ` Philippe Mathieu-Daudé
2021-01-29 18:53       ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 10/12] target/arm: Do not build TCG objects when TCG is off Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-10-03  9:52   ` Richard Henderson
2020-10-03  9:52     ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 11/12] target/arm: Reorder meson.build rules Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-10-03  9:53   ` Richard Henderson
2020-10-03  9:53     ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 12/12] .travis.yml: Add a KVM-only Aarch64 job Philippe Mathieu-Daudé
2020-09-29 22:43   ` Philippe Mathieu-Daudé
2020-10-03 10:03   ` Richard Henderson
2020-10-03 10:03     ` Richard Henderson
2020-10-03 10:14     ` Thomas Huth
2020-10-03 10:14       ` Thomas Huth
2020-10-03 10:37       ` Richard Henderson
2020-10-03 10:37         ` Richard Henderson
2020-09-30  7:58 ` [PATCH v4 00/12] Support disabling TCG on ARM (part 2) Igor Mammedov
2020-09-30  7:58   ` Igor Mammedov
2020-09-30 10:20   ` Philippe Mathieu-Daudé
2020-09-30 10:20     ` Philippe Mathieu-Daudé
2021-01-28  0:41 ` Alex Bennée
2021-01-28  0:41   ` Alex Bennée
2021-01-28 11:02   ` Philippe Mathieu-Daudé
2021-01-28 11:02     ` Philippe Mathieu-Daudé
2021-01-28 15:42     ` Alex Bennée
2021-01-28 15:42       ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200929224355.1224017-3-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=cfontana@suse.de \
    --cc=fam@euphon.net \
    --cc=kvm@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=rth@twiddle.net \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.