Some targets use "default y" for boards to filter out those that require
TCG. For consistency we are switching all other targets to do the same.
Continue with Nios2.
No changes to generated config-devices.mak file.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
configs/devices/nios2-softmmu/default.mak | 7 +++----
hw/nios2/Kconfig | 9 ++++-----
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/configs/devices/nios2-softmmu/default.mak
b/configs/devices/nios2-softmmu/default.mak
index e130d024e62..50a68d26b0f 100644
--- a/configs/devices/nios2-softmmu/default.mak
+++ b/configs/devices/nios2-softmmu/default.mak
@@ -1,6 +1,5 @@
# Default configuration for nios2-softmmu
-# Boards:
-#
-CONFIG_NIOS2_10M50=y
-CONFIG_NIOS2_GENERIC_NOMMU=y
+# Boards are selected by default, uncomment to keep out of the build.
+# CONFIG_NIOS2_10M50=n
+# CONFIG_NIOS2_GENERIC_NOMMU=n
diff --git a/hw/nios2/Kconfig b/hw/nios2/Kconfig
index 4748ae27b67..ab7866a5358 100644
--- a/hw/nios2/Kconfig
+++ b/hw/nios2/Kconfig
@@ -1,13 +1,12 @@
config NIOS2_10M50
bool
- select NIOS2
+ default y
+ depends on NIOS2
select SERIAL
select ALTERA_TIMER
select NIOS2_VIC
config NIOS2_GENERIC_NOMMU
bool
- select NIOS2
-
-config NIOS2
- bool
+ default y
+ depends on NIOS2
--
2.44.0
