default-configs: move files to default-configs/devices/
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 18 Sep 2020 10:06:09 +0000 (06:06 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Sat, 3 Oct 2020 12:07:35 +0000 (08:07 -0400)
Make room for target files in default-configs/targets/

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
148 files changed:
configure
default-configs/aarch64-linux-user.mak [deleted file]
default-configs/aarch64-softmmu.mak [deleted file]
default-configs/aarch64_be-linux-user.mak [deleted file]
default-configs/alpha-linux-user.mak [deleted file]
default-configs/alpha-softmmu.mak [deleted file]
default-configs/arm-linux-user.mak [deleted file]
default-configs/arm-softmmu.mak [deleted file]
default-configs/armeb-linux-user.mak [deleted file]
default-configs/avr-softmmu.mak [deleted file]
default-configs/cris-linux-user.mak [deleted file]
default-configs/cris-softmmu.mak [deleted file]
default-configs/devices/aarch64-linux-user.mak [new file with mode: 0644]
default-configs/devices/aarch64-softmmu.mak [new file with mode: 0644]
default-configs/devices/aarch64_be-linux-user.mak [new file with mode: 0644]
default-configs/devices/alpha-linux-user.mak [new file with mode: 0644]
default-configs/devices/alpha-softmmu.mak [new file with mode: 0644]
default-configs/devices/arm-linux-user.mak [new file with mode: 0644]
default-configs/devices/arm-softmmu.mak [new file with mode: 0644]
default-configs/devices/armeb-linux-user.mak [new file with mode: 0644]
default-configs/devices/avr-softmmu.mak [new file with mode: 0644]
default-configs/devices/cris-linux-user.mak [new file with mode: 0644]
default-configs/devices/cris-softmmu.mak [new file with mode: 0644]
default-configs/devices/hppa-linux-user.mak [new file with mode: 0644]
default-configs/devices/hppa-softmmu.mak [new file with mode: 0644]
default-configs/devices/i386-bsd-user.mak [new file with mode: 0644]
default-configs/devices/i386-linux-user.mak [new file with mode: 0644]
default-configs/devices/i386-softmmu.mak [new file with mode: 0644]
default-configs/devices/lm32-softmmu.mak [new file with mode: 0644]
default-configs/devices/m68k-linux-user.mak [new file with mode: 0644]
default-configs/devices/m68k-softmmu.mak [new file with mode: 0644]
default-configs/devices/microblaze-linux-user.mak [new file with mode: 0644]
default-configs/devices/microblaze-softmmu.mak [new file with mode: 0644]
default-configs/devices/microblazeel-linux-user.mak [new file with mode: 0644]
default-configs/devices/microblazeel-softmmu.mak [new file with mode: 0644]
default-configs/devices/mips-linux-user.mak [new file with mode: 0644]
default-configs/devices/mips-softmmu-common.mak [new file with mode: 0644]
default-configs/devices/mips-softmmu.mak [new file with mode: 0644]
default-configs/devices/mips64-linux-user.mak [new file with mode: 0644]
default-configs/devices/mips64-softmmu.mak [new file with mode: 0644]
default-configs/devices/mips64el-linux-user.mak [new file with mode: 0644]
default-configs/devices/mips64el-softmmu.mak [new file with mode: 0644]
default-configs/devices/mipsel-linux-user.mak [new file with mode: 0644]
default-configs/devices/mipsel-softmmu.mak [new file with mode: 0644]
default-configs/devices/mipsn32-linux-user.mak [new file with mode: 0644]
default-configs/devices/mipsn32el-linux-user.mak [new file with mode: 0644]
default-configs/devices/moxie-softmmu.mak [new file with mode: 0644]
default-configs/devices/nios2-linux-user.mak [new file with mode: 0644]
default-configs/devices/nios2-softmmu.mak [new file with mode: 0644]
default-configs/devices/or1k-linux-user.mak [new file with mode: 0644]
default-configs/devices/or1k-softmmu.mak [new file with mode: 0644]
default-configs/devices/ppc-linux-user.mak [new file with mode: 0644]
default-configs/devices/ppc-softmmu.mak [new file with mode: 0644]
default-configs/devices/ppc64-linux-user.mak [new file with mode: 0644]
default-configs/devices/ppc64-softmmu.mak [new file with mode: 0644]
default-configs/devices/ppc64abi32-linux-user.mak [new file with mode: 0644]
default-configs/devices/ppc64le-linux-user.mak [new file with mode: 0644]
default-configs/devices/riscv32-linux-user.mak [new file with mode: 0644]
default-configs/devices/riscv32-softmmu.mak [new file with mode: 0644]
default-configs/devices/riscv64-linux-user.mak [new file with mode: 0644]
default-configs/devices/riscv64-softmmu.mak [new file with mode: 0644]
default-configs/devices/rx-softmmu.mak [new file with mode: 0644]
default-configs/devices/s390x-linux-user.mak [new file with mode: 0644]
default-configs/devices/s390x-softmmu.mak [new file with mode: 0644]
default-configs/devices/sh4-linux-user.mak [new file with mode: 0644]
default-configs/devices/sh4-softmmu.mak [new file with mode: 0644]
default-configs/devices/sh4eb-linux-user.mak [new file with mode: 0644]
default-configs/devices/sh4eb-softmmu.mak [new file with mode: 0644]
default-configs/devices/sparc-bsd-user.mak [new file with mode: 0644]
default-configs/devices/sparc-linux-user.mak [new file with mode: 0644]
default-configs/devices/sparc-softmmu.mak [new file with mode: 0644]
default-configs/devices/sparc32plus-linux-user.mak [new file with mode: 0644]
default-configs/devices/sparc64-bsd-user.mak [new file with mode: 0644]
default-configs/devices/sparc64-linux-user.mak [new file with mode: 0644]
default-configs/devices/sparc64-softmmu.mak [new file with mode: 0644]
default-configs/devices/tilegx-linux-user.mak [new file with mode: 0644]
default-configs/devices/tricore-softmmu.mak [new file with mode: 0644]
default-configs/devices/unicore32-softmmu.mak [new file with mode: 0644]
default-configs/devices/x86_64-bsd-user.mak [new file with mode: 0644]
default-configs/devices/x86_64-linux-user.mak [new file with mode: 0644]
default-configs/devices/x86_64-softmmu.mak [new file with mode: 0644]
default-configs/devices/xtensa-linux-user.mak [new file with mode: 0644]
default-configs/devices/xtensa-softmmu.mak [new file with mode: 0644]
default-configs/devices/xtensaeb-linux-user.mak [new file with mode: 0644]
default-configs/devices/xtensaeb-softmmu.mak [new file with mode: 0644]
default-configs/hppa-linux-user.mak [deleted file]
default-configs/hppa-softmmu.mak [deleted file]
default-configs/i386-bsd-user.mak [deleted file]
default-configs/i386-linux-user.mak [deleted file]
default-configs/i386-softmmu.mak [deleted file]
default-configs/lm32-softmmu.mak [deleted file]
default-configs/m68k-linux-user.mak [deleted file]
default-configs/m68k-softmmu.mak [deleted file]
default-configs/microblaze-linux-user.mak [deleted file]
default-configs/microblaze-softmmu.mak [deleted file]
default-configs/microblazeel-linux-user.mak [deleted file]
default-configs/microblazeel-softmmu.mak [deleted file]
default-configs/mips-linux-user.mak [deleted file]
default-configs/mips-softmmu-common.mak [deleted file]
default-configs/mips-softmmu.mak [deleted file]
default-configs/mips64-linux-user.mak [deleted file]
default-configs/mips64-softmmu.mak [deleted file]
default-configs/mips64el-linux-user.mak [deleted file]
default-configs/mips64el-softmmu.mak [deleted file]
default-configs/mipsel-linux-user.mak [deleted file]
default-configs/mipsel-softmmu.mak [deleted file]
default-configs/mipsn32-linux-user.mak [deleted file]
default-configs/mipsn32el-linux-user.mak [deleted file]
default-configs/moxie-softmmu.mak [deleted file]
default-configs/nios2-linux-user.mak [deleted file]
default-configs/nios2-softmmu.mak [deleted file]
default-configs/or1k-linux-user.mak [deleted file]
default-configs/or1k-softmmu.mak [deleted file]
default-configs/ppc-linux-user.mak [deleted file]
default-configs/ppc-softmmu.mak [deleted file]
default-configs/ppc64-linux-user.mak [deleted file]
default-configs/ppc64-softmmu.mak [deleted file]
default-configs/ppc64abi32-linux-user.mak [deleted file]
default-configs/ppc64le-linux-user.mak [deleted file]
default-configs/riscv32-linux-user.mak [deleted file]
default-configs/riscv32-softmmu.mak [deleted file]
default-configs/riscv64-linux-user.mak [deleted file]
default-configs/riscv64-softmmu.mak [deleted file]
default-configs/rx-softmmu.mak [deleted file]
default-configs/s390x-linux-user.mak [deleted file]
default-configs/s390x-softmmu.mak [deleted file]
default-configs/sh4-linux-user.mak [deleted file]
default-configs/sh4-softmmu.mak [deleted file]
default-configs/sh4eb-linux-user.mak [deleted file]
default-configs/sh4eb-softmmu.mak [deleted file]
default-configs/sparc-bsd-user.mak [deleted file]
default-configs/sparc-linux-user.mak [deleted file]
default-configs/sparc-softmmu.mak [deleted file]
default-configs/sparc32plus-linux-user.mak [deleted file]
default-configs/sparc64-bsd-user.mak [deleted file]
default-configs/sparc64-linux-user.mak [deleted file]
default-configs/sparc64-softmmu.mak [deleted file]
default-configs/tilegx-linux-user.mak [deleted file]
default-configs/tricore-softmmu.mak [deleted file]
default-configs/unicore32-softmmu.mak [deleted file]
default-configs/x86_64-bsd-user.mak [deleted file]
default-configs/x86_64-linux-user.mak [deleted file]
default-configs/x86_64-softmmu.mak [deleted file]
default-configs/xtensa-linux-user.mak [deleted file]
default-configs/xtensa-softmmu.mak [deleted file]
default-configs/xtensaeb-linux-user.mak [deleted file]
default-configs/xtensaeb-softmmu.mak [deleted file]
meson.build

index a5841241be99310ff0b0a459cf06f4e9602d3785..1981f58aa90fb4c81d568f69bdeeac5c9f261458 100755 (executable)
--- a/configure
+++ b/configure
@@ -1719,13 +1719,13 @@ default_target_list=""
 mak_wilds=""
 
 if [ "$softmmu" = "yes" ]; then
-    mak_wilds="${mak_wilds} $source_path/default-configs/*-softmmu.mak"
+    mak_wilds="${mak_wilds} $source_path/default-configs/devices/*-softmmu.mak"
 fi
 if [ "$linux_user" = "yes" ]; then
-    mak_wilds="${mak_wilds} $source_path/default-configs/*-linux-user.mak"
+    mak_wilds="${mak_wilds} $source_path/default-configs/devices/*-linux-user.mak"
 fi
 if [ "$bsd_user" = "yes" ]; then
-    mak_wilds="${mak_wilds} $source_path/default-configs/*-bsd-user.mak"
+    mak_wilds="${mak_wilds} $source_path/default-configs/devices/*-bsd-user.mak"
 fi
 
 # If the user doesn't explicitly specify a deprecated target we will
diff --git a/default-configs/aarch64-linux-user.mak b/default-configs/aarch64-linux-user.mak
deleted file mode 100644 (file)
index 0a5b08a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for aarch64-linux-user
diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
deleted file mode 100644 (file)
index 958b1e0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default configuration for aarch64-softmmu
-
-# We support all the 32 bit boards so need all their config
-include arm-softmmu.mak
-
-CONFIG_XLNX_ZYNQMP_ARM=y
-CONFIG_XLNX_VERSAL=y
-CONFIG_SBSA_REF=y
diff --git a/default-configs/aarch64_be-linux-user.mak b/default-configs/aarch64_be-linux-user.mak
deleted file mode 100644 (file)
index a69d9d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for aarch64_be-linux-user
diff --git a/default-configs/alpha-linux-user.mak b/default-configs/alpha-linux-user.mak
deleted file mode 100644 (file)
index 7956e29..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for alpha-linux-user
diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
deleted file mode 100644 (file)
index d186fe8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default configuration for alpha-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-#CONFIG_TEST_DEVICES=n
-
-# Boards:
-#
-CONFIG_DP264=y
diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak
deleted file mode 100644 (file)
index 413361a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for arm-linux-user
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
deleted file mode 100644 (file)
index 9a94ebd..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# Default configuration for arm-softmmu
-
-# TODO: ARM_V7M is currently always required - make this more flexible!
-CONFIG_ARM_V7M=y
-
-# CONFIG_PCI_DEVICES=n
-# CONFIG_TEST_DEVICES=n
-
-CONFIG_ARM_VIRT=y
-CONFIG_CUBIEBOARD=y
-CONFIG_EXYNOS4=y
-CONFIG_HIGHBANK=y
-CONFIG_INTEGRATOR=y
-CONFIG_FSL_IMX31=y
-CONFIG_MUSICPAL=y
-CONFIG_MUSCA=y
-CONFIG_CHEETAH=y
-CONFIG_SX1=y
-CONFIG_NSERIES=y
-CONFIG_STELLARIS=y
-CONFIG_REALVIEW=y
-CONFIG_VERSATILE=y
-CONFIG_VEXPRESS=y
-CONFIG_ZYNQ=y
-CONFIG_MAINSTONE=y
-CONFIG_GUMSTIX=y
-CONFIG_SPITZ=y
-CONFIG_TOSA=y
-CONFIG_Z2=y
-CONFIG_NPCM7XX=y
-CONFIG_COLLIE=y
-CONFIG_ASPEED_SOC=y
-CONFIG_NETDUINO2=y
-CONFIG_NETDUINOPLUS2=y
-CONFIG_MPS2=y
-CONFIG_RASPI=y
-CONFIG_DIGIC=y
-CONFIG_SABRELITE=y
-CONFIG_EMCRAFT_SF2=y
-CONFIG_MICROBIT=y
-CONFIG_FSL_IMX25=y
-CONFIG_FSL_IMX7=y
-CONFIG_FSL_IMX6UL=y
-CONFIG_SEMIHOSTING=y
-CONFIG_ALLWINNER_H3=y
-CONFIG_ACPI_APEI=y
diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak
deleted file mode 100644 (file)
index bf2ffe7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for armeb-linux-user
diff --git a/default-configs/avr-softmmu.mak b/default-configs/avr-softmmu.mak
deleted file mode 100644 (file)
index 80218ad..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for avr-softmmu
-
-# Boards:
-#
-CONFIG_ARDUINO=y
diff --git a/default-configs/cris-linux-user.mak b/default-configs/cris-linux-user.mak
deleted file mode 100644 (file)
index e3aec7b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for cris-linux-user
diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
deleted file mode 100644 (file)
index 5932cf4..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for cris-softmmu
-
-# Boards:
-#
-CONFIG_AXIS=y
diff --git a/default-configs/devices/aarch64-linux-user.mak b/default-configs/devices/aarch64-linux-user.mak
new file mode 100644 (file)
index 0000000..0a5b08a
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for aarch64-linux-user
diff --git a/default-configs/devices/aarch64-softmmu.mak b/default-configs/devices/aarch64-softmmu.mak
new file mode 100644 (file)
index 0000000..958b1e0
--- /dev/null
@@ -0,0 +1,8 @@
+# Default configuration for aarch64-softmmu
+
+# We support all the 32 bit boards so need all their config
+include arm-softmmu.mak
+
+CONFIG_XLNX_ZYNQMP_ARM=y
+CONFIG_XLNX_VERSAL=y
+CONFIG_SBSA_REF=y
diff --git a/default-configs/devices/aarch64_be-linux-user.mak b/default-configs/devices/aarch64_be-linux-user.mak
new file mode 100644 (file)
index 0000000..a69d9d2
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for aarch64_be-linux-user
diff --git a/default-configs/devices/alpha-linux-user.mak b/default-configs/devices/alpha-linux-user.mak
new file mode 100644 (file)
index 0000000..7956e29
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for alpha-linux-user
diff --git a/default-configs/devices/alpha-softmmu.mak b/default-configs/devices/alpha-softmmu.mak
new file mode 100644 (file)
index 0000000..d186fe8
--- /dev/null
@@ -0,0 +1,10 @@
+# Default configuration for alpha-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_PCI_DEVICES=n
+#CONFIG_TEST_DEVICES=n
+
+# Boards:
+#
+CONFIG_DP264=y
diff --git a/default-configs/devices/arm-linux-user.mak b/default-configs/devices/arm-linux-user.mak
new file mode 100644 (file)
index 0000000..413361a
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for arm-linux-user
diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak
new file mode 100644 (file)
index 0000000..9a94ebd
--- /dev/null
@@ -0,0 +1,46 @@
+# Default configuration for arm-softmmu
+
+# TODO: ARM_V7M is currently always required - make this more flexible!
+CONFIG_ARM_V7M=y
+
+# CONFIG_PCI_DEVICES=n
+# CONFIG_TEST_DEVICES=n
+
+CONFIG_ARM_VIRT=y
+CONFIG_CUBIEBOARD=y
+CONFIG_EXYNOS4=y
+CONFIG_HIGHBANK=y
+CONFIG_INTEGRATOR=y
+CONFIG_FSL_IMX31=y
+CONFIG_MUSICPAL=y
+CONFIG_MUSCA=y
+CONFIG_CHEETAH=y
+CONFIG_SX1=y
+CONFIG_NSERIES=y
+CONFIG_STELLARIS=y
+CONFIG_REALVIEW=y
+CONFIG_VERSATILE=y
+CONFIG_VEXPRESS=y
+CONFIG_ZYNQ=y
+CONFIG_MAINSTONE=y
+CONFIG_GUMSTIX=y
+CONFIG_SPITZ=y
+CONFIG_TOSA=y
+CONFIG_Z2=y
+CONFIG_NPCM7XX=y
+CONFIG_COLLIE=y
+CONFIG_ASPEED_SOC=y
+CONFIG_NETDUINO2=y
+CONFIG_NETDUINOPLUS2=y
+CONFIG_MPS2=y
+CONFIG_RASPI=y
+CONFIG_DIGIC=y
+CONFIG_SABRELITE=y
+CONFIG_EMCRAFT_SF2=y
+CONFIG_MICROBIT=y
+CONFIG_FSL_IMX25=y
+CONFIG_FSL_IMX7=y
+CONFIG_FSL_IMX6UL=y
+CONFIG_SEMIHOSTING=y
+CONFIG_ALLWINNER_H3=y
+CONFIG_ACPI_APEI=y
diff --git a/default-configs/devices/armeb-linux-user.mak b/default-configs/devices/armeb-linux-user.mak
new file mode 100644 (file)
index 0000000..bf2ffe7
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for armeb-linux-user
diff --git a/default-configs/devices/avr-softmmu.mak b/default-configs/devices/avr-softmmu.mak
new file mode 100644 (file)
index 0000000..80218ad
--- /dev/null
@@ -0,0 +1,5 @@
+# Default configuration for avr-softmmu
+
+# Boards:
+#
+CONFIG_ARDUINO=y
diff --git a/default-configs/devices/cris-linux-user.mak b/default-configs/devices/cris-linux-user.mak
new file mode 100644 (file)
index 0000000..e3aec7b
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for cris-linux-user
diff --git a/default-configs/devices/cris-softmmu.mak b/default-configs/devices/cris-softmmu.mak
new file mode 100644 (file)
index 0000000..5932cf4
--- /dev/null
@@ -0,0 +1,5 @@
+# Default configuration for cris-softmmu
+
+# Boards:
+#
+CONFIG_AXIS=y
diff --git a/default-configs/devices/hppa-linux-user.mak b/default-configs/devices/hppa-linux-user.mak
new file mode 100644 (file)
index 0000000..7963939
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for hppa-linux-user
diff --git a/default-configs/devices/hppa-softmmu.mak b/default-configs/devices/hppa-softmmu.mak
new file mode 100644 (file)
index 0000000..b64c5eb
--- /dev/null
@@ -0,0 +1,9 @@
+# Default configuration for hppa-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_PCI_DEVICES=n
+
+# Boards:
+#
+CONFIG_DINO=y
diff --git a/default-configs/devices/i386-bsd-user.mak b/default-configs/devices/i386-bsd-user.mak
new file mode 100644 (file)
index 0000000..af1b31a
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for i386-bsd-user
diff --git a/default-configs/devices/i386-linux-user.mak b/default-configs/devices/i386-linux-user.mak
new file mode 100644 (file)
index 0000000..8657e68
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for i386-linux-user
diff --git a/default-configs/devices/i386-softmmu.mak b/default-configs/devices/i386-softmmu.mak
new file mode 100644 (file)
index 0000000..84d1a24
--- /dev/null
@@ -0,0 +1,31 @@
+# Default configuration for i386-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_AMD_IOMMU=n
+#CONFIG_APPLESMC=n
+#CONFIG_FDC=n
+#CONFIG_HPET=n
+#CONFIG_HYPERV=n
+#CONFIG_ISA_DEBUG=n
+#CONFIG_ISA_IPMI_BT=n
+#CONFIG_ISA_IPMI_KCS=n
+#CONFIG_PCI_IPMI_KCS=n
+#CONFIG_PCI_IPMI_BT=n
+#CONFIG_IPMI_SSIF=n
+#CONFIG_PCI_DEVICES=n
+#CONFIG_PVPANIC=n
+#CONFIG_QXL=n
+#CONFIG_SEV=n
+#CONFIG_SGA=n
+#CONFIG_TEST_DEVICES=n
+#CONFIG_TPM_CRB=n
+#CONFIG_TPM_TIS_ISA=n
+#CONFIG_VTD=n
+
+# Boards:
+#
+CONFIG_ISAPC=y
+CONFIG_I440FX=y
+CONFIG_Q35=y
+CONFIG_MICROVM=y
diff --git a/default-configs/devices/lm32-softmmu.mak b/default-configs/devices/lm32-softmmu.mak
new file mode 100644 (file)
index 0000000..115b3e3
--- /dev/null
@@ -0,0 +1,12 @@
+# Default configuration for lm32-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_MILKYMIST_TMU2=n        # disabling it actually causes compile-time failures
+
+CONFIG_SEMIHOSTING=y
+
+# Boards:
+#
+CONFIG_LM32=y
+CONFIG_MILKYMIST=y
diff --git a/default-configs/devices/m68k-linux-user.mak b/default-configs/devices/m68k-linux-user.mak
new file mode 100644 (file)
index 0000000..06cd5ed
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for m68k-linux-user
diff --git a/default-configs/devices/m68k-softmmu.mak b/default-configs/devices/m68k-softmmu.mak
new file mode 100644 (file)
index 0000000..6629fd2
--- /dev/null
@@ -0,0 +1,10 @@
+# Default configuration for m68k-softmmu
+
+CONFIG_SEMIHOSTING=y
+
+# Boards:
+#
+CONFIG_AN5206=y
+CONFIG_MCF5208=y
+CONFIG_NEXTCUBE=y
+CONFIG_Q800=y
diff --git a/default-configs/devices/microblaze-linux-user.mak b/default-configs/devices/microblaze-linux-user.mak
new file mode 100644 (file)
index 0000000..566fdc0
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for microblaze-linux-user
diff --git a/default-configs/devices/microblaze-softmmu.mak b/default-configs/devices/microblaze-softmmu.mak
new file mode 100644 (file)
index 0000000..db8c6e4
--- /dev/null
@@ -0,0 +1,7 @@
+# Default configuration for microblaze-softmmu
+
+# Boards:
+#
+CONFIG_PETALOGIX_S3ADSP1800=y
+CONFIG_PETALOGIX_ML605=y
+CONFIG_XLNX_ZYNQMP_PMU=y
diff --git a/default-configs/devices/microblazeel-linux-user.mak b/default-configs/devices/microblazeel-linux-user.mak
new file mode 100644 (file)
index 0000000..378c6dd
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for microblazeel-linux-user
diff --git a/default-configs/devices/microblazeel-softmmu.mak b/default-configs/devices/microblazeel-softmmu.mak
new file mode 100644 (file)
index 0000000..2fcf442
--- /dev/null
@@ -0,0 +1,3 @@
+# Default configuration for microblazeel-softmmu
+
+include microblaze-softmmu.mak
diff --git a/default-configs/devices/mips-linux-user.mak b/default-configs/devices/mips-linux-user.mak
new file mode 100644 (file)
index 0000000..31df570
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for mips-linux-user
diff --git a/default-configs/devices/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak
new file mode 100644 (file)
index 0000000..da29c6c
--- /dev/null
@@ -0,0 +1,42 @@
+# Common mips*-softmmu CONFIG defines
+
+# CONFIG_SEMIHOSTING is always required on this architecture
+CONFIG_SEMIHOSTING=y
+
+CONFIG_ISA_BUS=y
+CONFIG_PCI=y
+CONFIG_PCI_DEVICES=y
+CONFIG_VGA_ISA=y
+CONFIG_VGA_ISA_MM=y
+CONFIG_VGA_CIRRUS=y
+CONFIG_VMWARE_VGA=y
+CONFIG_SERIAL=y
+CONFIG_SERIAL_ISA=y
+CONFIG_PARALLEL=y
+CONFIG_I8254=y
+CONFIG_PCSPK=y
+CONFIG_PCKBD=y
+CONFIG_FDC=y
+CONFIG_ACPI=y
+CONFIG_ACPI_X86=y
+CONFIG_ACPI_MEMORY_HOTPLUG=y
+CONFIG_ACPI_NVDIMM=y
+CONFIG_ACPI_CPU_HOTPLUG=y
+CONFIG_APM=y
+CONFIG_I8257=y
+CONFIG_PIIX4=y
+CONFIG_IDE_ISA=y
+CONFIG_IDE_PIIX=y
+CONFIG_PFLASH_CFI01=y
+CONFIG_I8259=y
+CONFIG_MC146818RTC=y
+CONFIG_EMPTY_SLOT=y
+CONFIG_MIPS_CPS=y
+CONFIG_MIPS_ITU=y
+CONFIG_R4K=y
+CONFIG_MALTA=y
+CONFIG_PCNET_PCI=y
+CONFIG_MIPSSIM=y
+CONFIG_ACPI_SMBUS=y
+CONFIG_SMBUS_EEPROM=y
+CONFIG_TEST_DEVICES=y
diff --git a/default-configs/devices/mips-softmmu.mak b/default-configs/devices/mips-softmmu.mak
new file mode 100644 (file)
index 0000000..9fede6e
--- /dev/null
@@ -0,0 +1,3 @@
+# Default configuration for mips-softmmu
+
+include mips-softmmu-common.mak
diff --git a/default-configs/devices/mips64-linux-user.mak b/default-configs/devices/mips64-linux-user.mak
new file mode 100644 (file)
index 0000000..1598bfc
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for mips64-linux-user
diff --git a/default-configs/devices/mips64-softmmu.mak b/default-configs/devices/mips64-softmmu.mak
new file mode 100644 (file)
index 0000000..a169738
--- /dev/null
@@ -0,0 +1,4 @@
+# Default configuration for mips64-softmmu
+
+include mips-softmmu-common.mak
+CONFIG_JAZZ=y
diff --git a/default-configs/devices/mips64el-linux-user.mak b/default-configs/devices/mips64el-linux-user.mak
new file mode 100644 (file)
index 0000000..629f084
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for mips64el-linux-user
diff --git a/default-configs/devices/mips64el-softmmu.mak b/default-configs/devices/mips64el-softmmu.mak
new file mode 100644 (file)
index 0000000..9f8a3ef
--- /dev/null
@@ -0,0 +1,14 @@
+# Default configuration for mips64el-softmmu
+
+include mips-softmmu-common.mak
+CONFIG_IDE_VIA=y
+CONFIG_FULOONG=y
+CONFIG_ATI_VGA=y
+CONFIG_RTL8139_PCI=y
+CONFIG_JAZZ=y
+CONFIG_VT82C686=y
+CONFIG_AHCI=y
+CONFIG_MIPS_BOSTON=y
+CONFIG_FITLOADER=y
+CONFIG_PCI_EXPRESS=y
+CONFIG_PCI_EXPRESS_XILINX=y
diff --git a/default-configs/devices/mipsel-linux-user.mak b/default-configs/devices/mipsel-linux-user.mak
new file mode 100644 (file)
index 0000000..4d0e4af
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for mipsel-linux-user
diff --git a/default-configs/devices/mipsel-softmmu.mak b/default-configs/devices/mipsel-softmmu.mak
new file mode 100644 (file)
index 0000000..a7f6059
--- /dev/null
@@ -0,0 +1,3 @@
+# Default configuration for mipsel-softmmu
+
+include mips-softmmu-common.mak
diff --git a/default-configs/devices/mipsn32-linux-user.mak b/default-configs/devices/mipsn32-linux-user.mak
new file mode 100644 (file)
index 0000000..5b97919
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for mipsn32-linux-user
diff --git a/default-configs/devices/mipsn32el-linux-user.mak b/default-configs/devices/mipsn32el-linux-user.mak
new file mode 100644 (file)
index 0000000..d6367ff
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for mipsn32el-linux-user
diff --git a/default-configs/devices/moxie-softmmu.mak b/default-configs/devices/moxie-softmmu.mak
new file mode 100644 (file)
index 0000000..bd50da3
--- /dev/null
@@ -0,0 +1,5 @@
+# Default configuration for moxie-softmmu
+
+# Boards:
+#
+CONFIG_MOXIESIM=y
diff --git a/default-configs/devices/nios2-linux-user.mak b/default-configs/devices/nios2-linux-user.mak
new file mode 100644 (file)
index 0000000..5be3eb7
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for nios2-linux-user
diff --git a/default-configs/devices/nios2-softmmu.mak b/default-configs/devices/nios2-softmmu.mak
new file mode 100644 (file)
index 0000000..1bc4082
--- /dev/null
@@ -0,0 +1,8 @@
+# Default configuration for nios2-softmmu
+
+CONFIG_SEMIHOSTING=y
+
+# Boards:
+#
+CONFIG_NIOS2_10M50=y
+CONFIG_NIOS2_GENERIC_NOMMU=y
diff --git a/default-configs/devices/or1k-linux-user.mak b/default-configs/devices/or1k-linux-user.mak
new file mode 100644 (file)
index 0000000..20e03c1
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for or1k-linux-user
diff --git a/default-configs/devices/or1k-softmmu.mak b/default-configs/devices/or1k-softmmu.mak
new file mode 100644 (file)
index 0000000..168101c
--- /dev/null
@@ -0,0 +1,5 @@
+# Default configuration for or1k-softmmu
+
+# Boards:
+#
+CONFIG_OR1K_SIM=y
diff --git a/default-configs/devices/ppc-linux-user.mak b/default-configs/devices/ppc-linux-user.mak
new file mode 100644 (file)
index 0000000..6273df2
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for ppc-linux-user
diff --git a/default-configs/devices/ppc-softmmu.mak b/default-configs/devices/ppc-softmmu.mak
new file mode 100644 (file)
index 0000000..61b78b8
--- /dev/null
@@ -0,0 +1,18 @@
+# Default configuration for ppc-softmmu
+
+# For embedded PPCs:
+CONFIG_DS1338=y
+CONFIG_E500=y
+CONFIG_PPC405=y
+CONFIG_PPC440=y
+CONFIG_VIRTEX=y
+
+# For Sam460ex
+CONFIG_SAM460EX=y
+
+# For Macs
+CONFIG_MAC_OLDWORLD=y
+CONFIG_MAC_NEWWORLD=y
+
+# For PReP
+CONFIG_PREP=y
diff --git a/default-configs/devices/ppc64-linux-user.mak b/default-configs/devices/ppc64-linux-user.mak
new file mode 100644 (file)
index 0000000..422d3fb
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for ppc64-linux-user
diff --git a/default-configs/devices/ppc64-softmmu.mak b/default-configs/devices/ppc64-softmmu.mak
new file mode 100644 (file)
index 0000000..ae0841f
--- /dev/null
@@ -0,0 +1,11 @@
+# Default configuration for ppc64-softmmu
+
+# Include all 32-bit boards
+include ppc-softmmu.mak
+
+# For PowerNV
+CONFIG_POWERNV=y
+
+# For pSeries
+CONFIG_PSERIES=y
+CONFIG_NVDIMM=y
diff --git a/default-configs/devices/ppc64abi32-linux-user.mak b/default-configs/devices/ppc64abi32-linux-user.mak
new file mode 100644 (file)
index 0000000..1c657ec
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for ppc64abi32-linux-user
diff --git a/default-configs/devices/ppc64le-linux-user.mak b/default-configs/devices/ppc64le-linux-user.mak
new file mode 100644 (file)
index 0000000..63f4269
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for ppc64le-linux-user
diff --git a/default-configs/devices/riscv32-linux-user.mak b/default-configs/devices/riscv32-linux-user.mak
new file mode 100644 (file)
index 0000000..865b362
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for riscv-linux-user
diff --git a/default-configs/devices/riscv32-softmmu.mak b/default-configs/devices/riscv32-softmmu.mak
new file mode 100644 (file)
index 0000000..94a236c
--- /dev/null
@@ -0,0 +1,13 @@
+# Default configuration for riscv32-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_PCI_DEVICES=n
+
+# Boards:
+#
+CONFIG_SPIKE=y
+CONFIG_SIFIVE_E=y
+CONFIG_SIFIVE_U=y
+CONFIG_RISCV_VIRT=y
+CONFIG_OPENTITAN=y
diff --git a/default-configs/devices/riscv64-linux-user.mak b/default-configs/devices/riscv64-linux-user.mak
new file mode 100644 (file)
index 0000000..865b362
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for riscv-linux-user
diff --git a/default-configs/devices/riscv64-softmmu.mak b/default-configs/devices/riscv64-softmmu.mak
new file mode 100644 (file)
index 0000000..76b6195
--- /dev/null
@@ -0,0 +1,13 @@
+# Default configuration for riscv64-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_PCI_DEVICES=n
+
+# Boards:
+#
+CONFIG_SPIKE=y
+CONFIG_SIFIVE_E=y
+CONFIG_SIFIVE_U=y
+CONFIG_RISCV_VIRT=y
+CONFIG_MICROCHIP_PFSOC=y
diff --git a/default-configs/devices/rx-softmmu.mak b/default-configs/devices/rx-softmmu.mak
new file mode 100644 (file)
index 0000000..df2b4e4
--- /dev/null
@@ -0,0 +1,3 @@
+# Default configuration for rx-softmmu
+
+CONFIG_RX_GDBSIM=y
diff --git a/default-configs/devices/s390x-linux-user.mak b/default-configs/devices/s390x-linux-user.mak
new file mode 100644 (file)
index 0000000..a243c99
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for s390x-linux-user
diff --git a/default-configs/devices/s390x-softmmu.mak b/default-configs/devices/s390x-softmmu.mak
new file mode 100644 (file)
index 0000000..f2287a1
--- /dev/null
@@ -0,0 +1,13 @@
+# Default configuration for s390x-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_TERMINAL3270=n
+#CONFIG_VFIO_AP=n
+#CONFIG_VFIO_CCW=n
+#CONFIG_VIRTIO_PCI=n
+#CONFIG_WDT_DIAG288=n
+
+# Boards:
+#
+CONFIG_S390_CCW_VIRTIO=y
diff --git a/default-configs/devices/sh4-linux-user.mak b/default-configs/devices/sh4-linux-user.mak
new file mode 100644 (file)
index 0000000..a469e19
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for sh4-linux-user
diff --git a/default-configs/devices/sh4-softmmu.mak b/default-configs/devices/sh4-softmmu.mak
new file mode 100644 (file)
index 0000000..565e8b0
--- /dev/null
@@ -0,0 +1,11 @@
+# Default configuration for sh4eb-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_PCI_DEVICES=n
+#CONFIG_TEST_DEVICES=n
+
+# Boards:
+#
+CONFIG_R2D=y
+CONFIG_SHIX=y
diff --git a/default-configs/devices/sh4eb-linux-user.mak b/default-configs/devices/sh4eb-linux-user.mak
new file mode 100644 (file)
index 0000000..be08ca1
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for sh4eb-linux-user
diff --git a/default-configs/devices/sh4eb-softmmu.mak b/default-configs/devices/sh4eb-softmmu.mak
new file mode 100644 (file)
index 0000000..522a7a5
--- /dev/null
@@ -0,0 +1,3 @@
+# Default configuration for sh4eb-softmmu
+
+include sh4-softmmu.mak
diff --git a/default-configs/devices/sparc-bsd-user.mak b/default-configs/devices/sparc-bsd-user.mak
new file mode 100644 (file)
index 0000000..21e0950
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for sparc-bsd-user
diff --git a/default-configs/devices/sparc-linux-user.mak b/default-configs/devices/sparc-linux-user.mak
new file mode 100644 (file)
index 0000000..9c716d1
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for sparc-linux-user
diff --git a/default-configs/devices/sparc-softmmu.mak b/default-configs/devices/sparc-softmmu.mak
new file mode 100644 (file)
index 0000000..ee85218
--- /dev/null
@@ -0,0 +1,11 @@
+# Default configuration for sparc-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_TCX=n
+#CONFIG_CG3=n
+
+# Boards:
+#
+CONFIG_SUN4M=y
+CONFIG_LEON3=y
diff --git a/default-configs/devices/sparc32plus-linux-user.mak b/default-configs/devices/sparc32plus-linux-user.mak
new file mode 100644 (file)
index 0000000..432e880
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for sparc32plus-linux-user
diff --git a/default-configs/devices/sparc64-bsd-user.mak b/default-configs/devices/sparc64-bsd-user.mak
new file mode 100644 (file)
index 0000000..b8b9eea
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for sparc64-bsd-user
diff --git a/default-configs/devices/sparc64-linux-user.mak b/default-configs/devices/sparc64-linux-user.mak
new file mode 100644 (file)
index 0000000..bf1bdd6
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for sparc64-linux-user
diff --git a/default-configs/devices/sparc64-softmmu.mak b/default-configs/devices/sparc64-softmmu.mak
new file mode 100644 (file)
index 0000000..e50030a
--- /dev/null
@@ -0,0 +1,12 @@
+# Default configuration for sparc64-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_PCI_DEVICES=n
+#CONFIG_SUNHME=n
+#CONFIG_TEST_DEVICES=n
+
+# Boards:
+#
+CONFIG_SUN4U=y
+CONFIG_NIAGARA=y
diff --git a/default-configs/devices/tilegx-linux-user.mak b/default-configs/devices/tilegx-linux-user.mak
new file mode 100644 (file)
index 0000000..3e47493
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for tilegx-linux-user
diff --git a/default-configs/devices/tricore-softmmu.mak b/default-configs/devices/tricore-softmmu.mak
new file mode 100644 (file)
index 0000000..c397cff
--- /dev/null
@@ -0,0 +1 @@
+CONFIG_TRICORE=y
diff --git a/default-configs/devices/unicore32-softmmu.mak b/default-configs/devices/unicore32-softmmu.mak
new file mode 100644 (file)
index 0000000..899288e
--- /dev/null
@@ -0,0 +1,6 @@
+# Default configuration for unicore32-softmmu
+
+# Boards:
+#
+CONFIG_PUV3=y
+CONFIG_SEMIHOSTING=y
diff --git a/default-configs/devices/x86_64-bsd-user.mak b/default-configs/devices/x86_64-bsd-user.mak
new file mode 100644 (file)
index 0000000..73e5d34
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for x86_64-bsd-user
diff --git a/default-configs/devices/x86_64-linux-user.mak b/default-configs/devices/x86_64-linux-user.mak
new file mode 100644 (file)
index 0000000..bec1d9e
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for x86_64-linux-user
diff --git a/default-configs/devices/x86_64-softmmu.mak b/default-configs/devices/x86_64-softmmu.mak
new file mode 100644 (file)
index 0000000..64b2ee2
--- /dev/null
@@ -0,0 +1,3 @@
+# Default configuration for x86_64-softmmu
+
+include i386-softmmu.mak
diff --git a/default-configs/devices/xtensa-linux-user.mak b/default-configs/devices/xtensa-linux-user.mak
new file mode 100644 (file)
index 0000000..fd1d350
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for xtensa-linux-user
diff --git a/default-configs/devices/xtensa-softmmu.mak b/default-configs/devices/xtensa-softmmu.mak
new file mode 100644 (file)
index 0000000..4fe1bf0
--- /dev/null
@@ -0,0 +1,9 @@
+# Default configuration for Xtensa
+
+CONFIG_SEMIHOSTING=y
+
+# Boards:
+#
+CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_VIRT=y
+CONFIG_XTENSA_XTFPGA=y
diff --git a/default-configs/devices/xtensaeb-linux-user.mak b/default-configs/devices/xtensaeb-linux-user.mak
new file mode 100644 (file)
index 0000000..fd1d350
--- /dev/null
@@ -0,0 +1 @@
+# Default configuration for xtensa-linux-user
diff --git a/default-configs/devices/xtensaeb-softmmu.mak b/default-configs/devices/xtensaeb-softmmu.mak
new file mode 100644 (file)
index 0000000..f7e48c7
--- /dev/null
@@ -0,0 +1,3 @@
+# Default configuration for Xtensa
+
+include xtensa-softmmu.mak
diff --git a/default-configs/hppa-linux-user.mak b/default-configs/hppa-linux-user.mak
deleted file mode 100644 (file)
index 7963939..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for hppa-linux-user
diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak
deleted file mode 100644 (file)
index b64c5eb..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default configuration for hppa-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-
-# Boards:
-#
-CONFIG_DINO=y
diff --git a/default-configs/i386-bsd-user.mak b/default-configs/i386-bsd-user.mak
deleted file mode 100644 (file)
index af1b31a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for i386-bsd-user
diff --git a/default-configs/i386-linux-user.mak b/default-configs/i386-linux-user.mak
deleted file mode 100644 (file)
index 8657e68..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for i386-linux-user
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
deleted file mode 100644 (file)
index 84d1a24..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-# Default configuration for i386-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_AMD_IOMMU=n
-#CONFIG_APPLESMC=n
-#CONFIG_FDC=n
-#CONFIG_HPET=n
-#CONFIG_HYPERV=n
-#CONFIG_ISA_DEBUG=n
-#CONFIG_ISA_IPMI_BT=n
-#CONFIG_ISA_IPMI_KCS=n
-#CONFIG_PCI_IPMI_KCS=n
-#CONFIG_PCI_IPMI_BT=n
-#CONFIG_IPMI_SSIF=n
-#CONFIG_PCI_DEVICES=n
-#CONFIG_PVPANIC=n
-#CONFIG_QXL=n
-#CONFIG_SEV=n
-#CONFIG_SGA=n
-#CONFIG_TEST_DEVICES=n
-#CONFIG_TPM_CRB=n
-#CONFIG_TPM_TIS_ISA=n
-#CONFIG_VTD=n
-
-# Boards:
-#
-CONFIG_ISAPC=y
-CONFIG_I440FX=y
-CONFIG_Q35=y
-CONFIG_MICROVM=y
diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
deleted file mode 100644 (file)
index 115b3e3..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Default configuration for lm32-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_MILKYMIST_TMU2=n        # disabling it actually causes compile-time failures
-
-CONFIG_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_LM32=y
-CONFIG_MILKYMIST=y
diff --git a/default-configs/m68k-linux-user.mak b/default-configs/m68k-linux-user.mak
deleted file mode 100644 (file)
index 06cd5ed..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for m68k-linux-user
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
deleted file mode 100644 (file)
index 6629fd2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default configuration for m68k-softmmu
-
-CONFIG_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_AN5206=y
-CONFIG_MCF5208=y
-CONFIG_NEXTCUBE=y
-CONFIG_Q800=y
diff --git a/default-configs/microblaze-linux-user.mak b/default-configs/microblaze-linux-user.mak
deleted file mode 100644 (file)
index 566fdc0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for microblaze-linux-user
diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
deleted file mode 100644 (file)
index db8c6e4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Default configuration for microblaze-softmmu
-
-# Boards:
-#
-CONFIG_PETALOGIX_S3ADSP1800=y
-CONFIG_PETALOGIX_ML605=y
-CONFIG_XLNX_ZYNQMP_PMU=y
diff --git a/default-configs/microblazeel-linux-user.mak b/default-configs/microblazeel-linux-user.mak
deleted file mode 100644 (file)
index 378c6dd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for microblazeel-linux-user
diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/microblazeel-softmmu.mak
deleted file mode 100644 (file)
index 2fcf442..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for microblazeel-softmmu
-
-include microblaze-softmmu.mak
diff --git a/default-configs/mips-linux-user.mak b/default-configs/mips-linux-user.mak
deleted file mode 100644 (file)
index 31df570..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips-linux-user
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
deleted file mode 100644 (file)
index da29c6c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-# Common mips*-softmmu CONFIG defines
-
-# CONFIG_SEMIHOSTING is always required on this architecture
-CONFIG_SEMIHOSTING=y
-
-CONFIG_ISA_BUS=y
-CONFIG_PCI=y
-CONFIG_PCI_DEVICES=y
-CONFIG_VGA_ISA=y
-CONFIG_VGA_ISA_MM=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_VMWARE_VGA=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_ACPI=y
-CONFIG_ACPI_X86=y
-CONFIG_ACPI_MEMORY_HOTPLUG=y
-CONFIG_ACPI_NVDIMM=y
-CONFIG_ACPI_CPU_HOTPLUG=y
-CONFIG_APM=y
-CONFIG_I8257=y
-CONFIG_PIIX4=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_PIIX=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_I8259=y
-CONFIG_MC146818RTC=y
-CONFIG_EMPTY_SLOT=y
-CONFIG_MIPS_CPS=y
-CONFIG_MIPS_ITU=y
-CONFIG_R4K=y
-CONFIG_MALTA=y
-CONFIG_PCNET_PCI=y
-CONFIG_MIPSSIM=y
-CONFIG_ACPI_SMBUS=y
-CONFIG_SMBUS_EEPROM=y
-CONFIG_TEST_DEVICES=y
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
deleted file mode 100644 (file)
index 9fede6e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for mips-softmmu
-
-include mips-softmmu-common.mak
diff --git a/default-configs/mips64-linux-user.mak b/default-configs/mips64-linux-user.mak
deleted file mode 100644 (file)
index 1598bfc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips64-linux-user
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
deleted file mode 100644 (file)
index a169738..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default configuration for mips64-softmmu
-
-include mips-softmmu-common.mak
-CONFIG_JAZZ=y
diff --git a/default-configs/mips64el-linux-user.mak b/default-configs/mips64el-linux-user.mak
deleted file mode 100644 (file)
index 629f084..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips64el-linux-user
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
deleted file mode 100644 (file)
index 9f8a3ef..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Default configuration for mips64el-softmmu
-
-include mips-softmmu-common.mak
-CONFIG_IDE_VIA=y
-CONFIG_FULOONG=y
-CONFIG_ATI_VGA=y
-CONFIG_RTL8139_PCI=y
-CONFIG_JAZZ=y
-CONFIG_VT82C686=y
-CONFIG_AHCI=y
-CONFIG_MIPS_BOSTON=y
-CONFIG_FITLOADER=y
-CONFIG_PCI_EXPRESS=y
-CONFIG_PCI_EXPRESS_XILINX=y
diff --git a/default-configs/mipsel-linux-user.mak b/default-configs/mipsel-linux-user.mak
deleted file mode 100644 (file)
index 4d0e4af..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsel-linux-user
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
deleted file mode 100644 (file)
index a7f6059..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for mipsel-softmmu
-
-include mips-softmmu-common.mak
diff --git a/default-configs/mipsn32-linux-user.mak b/default-configs/mipsn32-linux-user.mak
deleted file mode 100644 (file)
index 5b97919..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsn32-linux-user
diff --git a/default-configs/mipsn32el-linux-user.mak b/default-configs/mipsn32el-linux-user.mak
deleted file mode 100644 (file)
index d6367ff..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsn32el-linux-user
diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-softmmu.mak
deleted file mode 100644 (file)
index bd50da3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for moxie-softmmu
-
-# Boards:
-#
-CONFIG_MOXIESIM=y
diff --git a/default-configs/nios2-linux-user.mak b/default-configs/nios2-linux-user.mak
deleted file mode 100644 (file)
index 5be3eb7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for nios2-linux-user
diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak
deleted file mode 100644 (file)
index 1bc4082..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default configuration for nios2-softmmu
-
-CONFIG_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_NIOS2_10M50=y
-CONFIG_NIOS2_GENERIC_NOMMU=y
diff --git a/default-configs/or1k-linux-user.mak b/default-configs/or1k-linux-user.mak
deleted file mode 100644 (file)
index 20e03c1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for or1k-linux-user
diff --git a/default-configs/or1k-softmmu.mak b/default-configs/or1k-softmmu.mak
deleted file mode 100644 (file)
index 168101c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for or1k-softmmu
-
-# Boards:
-#
-CONFIG_OR1K_SIM=y
diff --git a/default-configs/ppc-linux-user.mak b/default-configs/ppc-linux-user.mak
deleted file mode 100644 (file)
index 6273df2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for ppc-linux-user
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
deleted file mode 100644 (file)
index 61b78b8..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Default configuration for ppc-softmmu
-
-# For embedded PPCs:
-CONFIG_DS1338=y
-CONFIG_E500=y
-CONFIG_PPC405=y
-CONFIG_PPC440=y
-CONFIG_VIRTEX=y
-
-# For Sam460ex
-CONFIG_SAM460EX=y
-
-# For Macs
-CONFIG_MAC_OLDWORLD=y
-CONFIG_MAC_NEWWORLD=y
-
-# For PReP
-CONFIG_PREP=y
diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/ppc64-linux-user.mak
deleted file mode 100644 (file)
index 422d3fb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for ppc64-linux-user
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
deleted file mode 100644 (file)
index ae0841f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default configuration for ppc64-softmmu
-
-# Include all 32-bit boards
-include ppc-softmmu.mak
-
-# For PowerNV
-CONFIG_POWERNV=y
-
-# For pSeries
-CONFIG_PSERIES=y
-CONFIG_NVDIMM=y
diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/ppc64abi32-linux-user.mak
deleted file mode 100644 (file)
index 1c657ec..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for ppc64abi32-linux-user
diff --git a/default-configs/ppc64le-linux-user.mak b/default-configs/ppc64le-linux-user.mak
deleted file mode 100644 (file)
index 63f4269..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for ppc64le-linux-user
diff --git a/default-configs/riscv32-linux-user.mak b/default-configs/riscv32-linux-user.mak
deleted file mode 100644 (file)
index 865b362..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for riscv-linux-user
diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
deleted file mode 100644 (file)
index 94a236c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default configuration for riscv32-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-
-# Boards:
-#
-CONFIG_SPIKE=y
-CONFIG_SIFIVE_E=y
-CONFIG_SIFIVE_U=y
-CONFIG_RISCV_VIRT=y
-CONFIG_OPENTITAN=y
diff --git a/default-configs/riscv64-linux-user.mak b/default-configs/riscv64-linux-user.mak
deleted file mode 100644 (file)
index 865b362..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for riscv-linux-user
diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak
deleted file mode 100644 (file)
index 76b6195..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default configuration for riscv64-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-
-# Boards:
-#
-CONFIG_SPIKE=y
-CONFIG_SIFIVE_E=y
-CONFIG_SIFIVE_U=y
-CONFIG_RISCV_VIRT=y
-CONFIG_MICROCHIP_PFSOC=y
diff --git a/default-configs/rx-softmmu.mak b/default-configs/rx-softmmu.mak
deleted file mode 100644 (file)
index df2b4e4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for rx-softmmu
-
-CONFIG_RX_GDBSIM=y
diff --git a/default-configs/s390x-linux-user.mak b/default-configs/s390x-linux-user.mak
deleted file mode 100644 (file)
index a243c99..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for s390x-linux-user
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
deleted file mode 100644 (file)
index f2287a1..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default configuration for s390x-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_TERMINAL3270=n
-#CONFIG_VFIO_AP=n
-#CONFIG_VFIO_CCW=n
-#CONFIG_VIRTIO_PCI=n
-#CONFIG_WDT_DIAG288=n
-
-# Boards:
-#
-CONFIG_S390_CCW_VIRTIO=y
diff --git a/default-configs/sh4-linux-user.mak b/default-configs/sh4-linux-user.mak
deleted file mode 100644 (file)
index a469e19..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sh4-linux-user
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
deleted file mode 100644 (file)
index 565e8b0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default configuration for sh4eb-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-#CONFIG_TEST_DEVICES=n
-
-# Boards:
-#
-CONFIG_R2D=y
-CONFIG_SHIX=y
diff --git a/default-configs/sh4eb-linux-user.mak b/default-configs/sh4eb-linux-user.mak
deleted file mode 100644 (file)
index be08ca1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sh4eb-linux-user
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
deleted file mode 100644 (file)
index 522a7a5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for sh4eb-softmmu
-
-include sh4-softmmu.mak
diff --git a/default-configs/sparc-bsd-user.mak b/default-configs/sparc-bsd-user.mak
deleted file mode 100644 (file)
index 21e0950..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc-bsd-user
diff --git a/default-configs/sparc-linux-user.mak b/default-configs/sparc-linux-user.mak
deleted file mode 100644 (file)
index 9c716d1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc-linux-user
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
deleted file mode 100644 (file)
index ee85218..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default configuration for sparc-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_TCX=n
-#CONFIG_CG3=n
-
-# Boards:
-#
-CONFIG_SUN4M=y
-CONFIG_LEON3=y
diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/sparc32plus-linux-user.mak
deleted file mode 100644 (file)
index 432e880..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc32plus-linux-user
diff --git a/default-configs/sparc64-bsd-user.mak b/default-configs/sparc64-bsd-user.mak
deleted file mode 100644 (file)
index b8b9eea..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc64-bsd-user
diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/sparc64-linux-user.mak
deleted file mode 100644 (file)
index bf1bdd6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc64-linux-user
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
deleted file mode 100644 (file)
index e50030a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Default configuration for sparc64-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-#CONFIG_SUNHME=n
-#CONFIG_TEST_DEVICES=n
-
-# Boards:
-#
-CONFIG_SUN4U=y
-CONFIG_NIAGARA=y
diff --git a/default-configs/tilegx-linux-user.mak b/default-configs/tilegx-linux-user.mak
deleted file mode 100644 (file)
index 3e47493..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for tilegx-linux-user
diff --git a/default-configs/tricore-softmmu.mak b/default-configs/tricore-softmmu.mak
deleted file mode 100644 (file)
index c397cff..0000000
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TRICORE=y
diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicore32-softmmu.mak
deleted file mode 100644 (file)
index 899288e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default configuration for unicore32-softmmu
-
-# Boards:
-#
-CONFIG_PUV3=y
-CONFIG_SEMIHOSTING=y
diff --git a/default-configs/x86_64-bsd-user.mak b/default-configs/x86_64-bsd-user.mak
deleted file mode 100644 (file)
index 73e5d34..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for x86_64-bsd-user
diff --git a/default-configs/x86_64-linux-user.mak b/default-configs/x86_64-linux-user.mak
deleted file mode 100644 (file)
index bec1d9e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for x86_64-linux-user
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
deleted file mode 100644 (file)
index 64b2ee2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for x86_64-softmmu
-
-include i386-softmmu.mak
diff --git a/default-configs/xtensa-linux-user.mak b/default-configs/xtensa-linux-user.mak
deleted file mode 100644 (file)
index fd1d350..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for xtensa-linux-user
diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak
deleted file mode 100644 (file)
index 4fe1bf0..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default configuration for Xtensa
-
-CONFIG_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_XTENSA_SIM=y
-CONFIG_XTENSA_VIRT=y
-CONFIG_XTENSA_XTFPGA=y
diff --git a/default-configs/xtensaeb-linux-user.mak b/default-configs/xtensaeb-linux-user.mak
deleted file mode 100644 (file)
index fd1d350..0000000
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for xtensa-linux-user
diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak
deleted file mode 100644 (file)
index f7e48c7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for Xtensa
-
-include xtensa-softmmu.mak
index 0f0cc21d16f4276f4075edfd38741c66fc3fec8c..41e5763e7527a8194f5e69515b220eac7c303bcc 100644 (file)
@@ -695,7 +695,7 @@ foreach target : target_dirs
 
     config_devices_mak = target + '-config-devices.mak'
     config_devices_mak = configure_file(
-      input: ['default-configs' / target + '.mak', 'Kconfig'],
+      input: ['default-configs/devices' / target + '.mak', 'Kconfig'],
       output: config_devices_mak,
       depfile: config_devices_mak + '.d',
       capture: true,