[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig |
Date: |
Wed, 30 Sep 2020 00:43:45 +0200 |
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
- [PATCH v4 00/12] Support disabling TCG on ARM (part 2), Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 01/12] accel/tcg: Add stub for cpu_loop_exit(), Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig,
Philippe Mathieu-Daudé <=
- [PATCH v4 03/12] target/arm: Select SEMIHOSTING if TCG is available, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 04/12] target/arm: Restrict ARMv4 cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 05/12] target/arm: Restrict ARMv5 cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 06/12] target/arm: Restrict ARMv6 cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 07/12] target/arm: Restrict ARMv7 R-profile cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 08/12] target/arm: Restrict ARMv7 M-profile cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 09/12] target/arm: Make m_helper.c optional via CONFIG_ARM_V7M, Philippe Mathieu-Daudé, 2020/09/29