meson: Introduce target-specific Kconfig

Add a target-specific Kconfig. We need the definitions in Kconfig so
the minikconf tool can verify they exits. However CONFIG_FOO is only
enabled for target foo via the meson.build rules.

Two architecture have a particularity, ARM and MIPS. As their
translators have been split you can potentially build a plain 32 bit
build along with a 64-bit version including the 32-bit subset.

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <20210131111316[email protected]>
Signed-off-by: Alex Bennée <[email protected]>
Reviewed-by: Thomas Huth <[email protected]>
Message-Id: <20210707131744[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/Kconfig b/Kconfig
index d52ebd839b393b284f464bd06e0d2ab96fec8389..fb6a24a2de8c3ff11d4ee432d65ad000ba9d6c4d 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -1,5 +1,6 @@
 source Kconfig.host
 source backends/Kconfig
 source accel/Kconfig
+source target/Kconfig
 source hw/Kconfig
 source semihosting/Kconfig

diff --git a/meson.build b/meson.build
index 5a56e3fe2f00e05afd2e464fed26305610302798..d82f7a789d1a179d1c44a2885955479c18feea57 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1604,7 +1604,8 @@ foreach target : target_dirs
       command: [minikconf,
                 get_option('default_devices') ? '--defconfig' : '--allnoconfig',
                 config_devices_mak, '@DEPFILE@', '@INPUT@',
-                host_kconfig, accel_kconfig])
+                host_kconfig, accel_kconfig,
+                'CONFIG_' + config_target['TARGET_ARCH'].to_upper() + '=y'])
 
     config_devices_data = configuration_data()
     config_devices = keyval.load(config_devices_mak)

diff --git a/target/Kconfig b/target/Kconfig
new file mode 100644 (file)
index 0000000..ae7f24f
--- /dev/null
+++ b/target/Kconfig
@@ -0,0 +1,19 @@
+source alpha/Kconfig
+source arm/Kconfig
+source avr/Kconfig
+source cris/Kconfig
+source hppa/Kconfig
+source i386/Kconfig
+source m68k/Kconfig
+source microblaze/Kconfig
+source mips/Kconfig
+source nios2/Kconfig
+source openrisc/Kconfig
+source ppc/Kconfig
+source riscv/Kconfig
+source rx/Kconfig
+source s390x/Kconfig
+source sh4/Kconfig
+source sparc/Kconfig
+source tricore/Kconfig
+source xtensa/Kconfig

diff --git a/target/alpha/Kconfig b/target/alpha/Kconfig
new file mode 100644 (file)
index 0000000..267222c
--- /dev/null
+++ b/target/alpha/Kconfig
@@ -0,0 +1,2 @@
+config ALPHA
+    bool

diff --git a/target/arm/Kconfig b/target/arm/Kconfig
new file mode 100644 (file)
index 0000000..3f3394a
--- /dev/null
+++ b/target/arm/Kconfig
@@ -0,0 +1,6 @@
+config ARM
+    bool
+
+config AARCH64
+    bool
+    select ARM

diff --git a/target/avr/Kconfig b/target/avr/Kconfig
new file mode 100644 (file)
index 0000000..155592d
--- /dev/null
+++ b/target/avr/Kconfig
@@ -0,0 +1,2 @@
+config AVR
+    bool

diff --git a/target/cris/Kconfig b/target/cris/Kconfig
new file mode 100644 (file)
index 0000000..3fdc309
--- /dev/null
+++ b/target/cris/Kconfig
@@ -0,0 +1,2 @@
+config CRIS
+    bool

diff --git a/target/hppa/Kconfig b/target/hppa/Kconfig
new file mode 100644 (file)
index 0000000..395a35d
--- /dev/null
+++ b/target/hppa/Kconfig
@@ -0,0 +1,2 @@
+config HPPA
+    bool

diff --git a/target/i386/Kconfig b/target/i386/Kconfig
new file mode 100644 (file)
index 0000000..ce69689
--- /dev/null
+++ b/target/i386/Kconfig
@@ -0,0 +1,5 @@
+config I386
+    bool
+
+config X86_64
+    bool

diff --git a/target/m68k/Kconfig b/target/m68k/Kconfig
new file mode 100644 (file)
index 0000000..23debad
--- /dev/null
+++ b/target/m68k/Kconfig
@@ -0,0 +1,2 @@
+config M68K
+    bool

diff --git a/target/microblaze/Kconfig b/target/microblaze/Kconfig
new file mode 100644 (file)
index 0000000..a5410d9
--- /dev/null
+++ b/target/microblaze/Kconfig
@@ -0,0 +1,2 @@
+config MICROBLAZE
+    bool

diff --git a/target/mips/Kconfig b/target/mips/Kconfig
new file mode 100644 (file)
index 0000000..6adf145
--- /dev/null
+++ b/target/mips/Kconfig
@@ -0,0 +1,6 @@
+config MIPS
+    bool
+
+config MIPS64
+    bool
+    select MIPS

diff --git a/target/nios2/Kconfig b/target/nios2/Kconfig
new file mode 100644 (file)
index 0000000..1529ab8
--- /dev/null
+++ b/target/nios2/Kconfig
@@ -0,0 +1,2 @@
+config NIOS2
+    bool

diff --git a/target/openrisc/Kconfig b/target/openrisc/Kconfig
new file mode 100644 (file)
index 0000000..e0da4ac
--- /dev/null
+++ b/target/openrisc/Kconfig
@@ -0,0 +1,2 @@
+config OPENRISC
+    bool

diff --git a/target/ppc/Kconfig b/target/ppc/Kconfig
new file mode 100644 (file)
index 0000000..3ff1520
--- /dev/null
+++ b/target/ppc/Kconfig
@@ -0,0 +1,5 @@
+config PPC
+    bool
+
+config PPC64
+    bool

diff --git a/target/riscv/Kconfig b/target/riscv/Kconfig
new file mode 100644 (file)
index 0000000..b9e5932
--- /dev/null
+++ b/target/riscv/Kconfig
@@ -0,0 +1,5 @@
+config RISCV32
+    bool
+
+config RISCV64
+    bool

diff --git a/target/rx/Kconfig b/target/rx/Kconfig
new file mode 100644 (file)
index 0000000..aceb5ed
--- /dev/null
+++ b/target/rx/Kconfig
@@ -0,0 +1,2 @@
+config RX
+    bool

diff --git a/target/s390x/Kconfig b/target/s390x/Kconfig
new file mode 100644 (file)
index 0000000..72da481
--- /dev/null
+++ b/target/s390x/Kconfig
@@ -0,0 +1,2 @@
+config S390X
+    bool

diff --git a/target/sh4/Kconfig b/target/sh4/Kconfig
new file mode 100644 (file)
index 0000000..2397c86
--- /dev/null
+++ b/target/sh4/Kconfig
@@ -0,0 +1,2 @@
+config SH4
+    bool

diff --git a/target/sparc/Kconfig b/target/sparc/Kconfig
new file mode 100644 (file)
index 0000000..70cc0f3
--- /dev/null
+++ b/target/sparc/Kconfig
@@ -0,0 +1,5 @@
+config SPARC
+    bool
+
+config SPARC64
+    bool

diff --git a/target/tricore/Kconfig b/target/tricore/Kconfig
new file mode 100644 (file)
index 0000000..9313409
--- /dev/null
+++ b/target/tricore/Kconfig
@@ -0,0 +1,2 @@
+config TRICORE
+    bool

diff --git a/target/xtensa/Kconfig b/target/xtensa/Kconfig
new file mode 100644 (file)
index 0000000..a3c8dc7
--- /dev/null
+++ b/target/xtensa/Kconfig
@@ -0,0 +1,2 @@
+config XTENSA
+    bool