75 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index a584124..1981f58 100755
--- 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/devices/aarch64-linux-user.mak
index 0a5b08a..0a5b08a 100644
--- a/default-configs/aarch64-linux-user.mak
+++ b/default-configs/devices/aarch64-linux-user.mak
diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/devices/aarch64-softmmu.mak
index 958b1e0..958b1e0 100644
--- a/default-configs/aarch64-softmmu.mak
+++ b/default-configs/devices/aarch64-softmmu.mak
diff --git a/default-configs/aarch64_be-linux-user.mak b/default-configs/devices/aarch64_be-linux-user.mak
index a69d9d2..a69d9d2 100644
--- a/default-configs/aarch64_be-linux-user.mak
+++ b/default-configs/devices/aarch64_be-linux-user.mak
diff --git a/default-configs/alpha-linux-user.mak b/default-configs/devices/alpha-linux-user.mak
index 7956e29..7956e29 100644
--- a/default-configs/alpha-linux-user.mak
+++ b/default-configs/devices/alpha-linux-user.mak
diff --git a/default-configs/alpha-softmmu.mak b/default-configs/devices/alpha-softmmu.mak
index d186fe8..d186fe8 100644
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/devices/alpha-softmmu.mak
diff --git a/default-configs/arm-linux-user.mak b/default-configs/devices/arm-linux-user.mak
index 413361a..413361a 100644
--- a/default-configs/arm-linux-user.mak
+++ b/default-configs/devices/arm-linux-user.mak
diff --git a/default-configs/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak
index 9a94ebd..9a94ebd 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/devices/arm-softmmu.mak
diff --git a/default-configs/armeb-linux-user.mak b/default-configs/devices/armeb-linux-user.mak
index bf2ffe7..bf2ffe7 100644
--- a/default-configs/armeb-linux-user.mak
+++ b/default-configs/devices/armeb-linux-user.mak
diff --git a/default-configs/avr-softmmu.mak b/default-configs/devices/avr-softmmu.mak
index 80218ad..80218ad 100644
--- a/default-configs/avr-softmmu.mak
+++ b/default-configs/devices/avr-softmmu.mak
diff --git a/default-configs/cris-linux-user.mak b/default-configs/devices/cris-linux-user.mak
index e3aec7b..e3aec7b 100644
--- a/default-configs/cris-linux-user.mak
+++ b/default-configs/devices/cris-linux-user.mak
diff --git a/default-configs/cris-softmmu.mak b/default-configs/devices/cris-softmmu.mak
index 5932cf4..5932cf4 100644
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/devices/cris-softmmu.mak
diff --git a/default-configs/hppa-linux-user.mak b/default-configs/devices/hppa-linux-user.mak
index 7963939..7963939 100644
--- a/default-configs/hppa-linux-user.mak
+++ b/default-configs/devices/hppa-linux-user.mak
diff --git a/default-configs/hppa-softmmu.mak b/default-configs/devices/hppa-softmmu.mak
index b64c5eb..b64c5eb 100644
--- a/default-configs/hppa-softmmu.mak
+++ b/default-configs/devices/hppa-softmmu.mak
diff --git a/default-configs/i386-bsd-user.mak b/default-configs/devices/i386-bsd-user.mak
index af1b31a..af1b31a 100644
--- a/default-configs/i386-bsd-user.mak
+++ b/default-configs/devices/i386-bsd-user.mak
diff --git a/default-configs/i386-linux-user.mak b/default-configs/devices/i386-linux-user.mak
index 8657e68..8657e68 100644
--- a/default-configs/i386-linux-user.mak
+++ b/default-configs/devices/i386-linux-user.mak
diff --git a/default-configs/i386-softmmu.mak b/default-configs/devices/i386-softmmu.mak
index 84d1a24..84d1a24 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/devices/i386-softmmu.mak
diff --git a/default-configs/lm32-softmmu.mak b/default-configs/devices/lm32-softmmu.mak
index 115b3e3..115b3e3 100644
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/devices/lm32-softmmu.mak
diff --git a/default-configs/m68k-linux-user.mak b/default-configs/devices/m68k-linux-user.mak
index 06cd5ed..06cd5ed 100644
--- a/default-configs/m68k-linux-user.mak
+++ b/default-configs/devices/m68k-linux-user.mak
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/devices/m68k-softmmu.mak
index 6629fd2..6629fd2 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/devices/m68k-softmmu.mak
diff --git a/default-configs/microblaze-linux-user.mak b/default-configs/devices/microblaze-linux-user.mak
index 566fdc0..566fdc0 100644
--- a/default-configs/microblaze-linux-user.mak
+++ b/default-configs/devices/microblaze-linux-user.mak
diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/devices/microblaze-softmmu.mak
index db8c6e4..db8c6e4 100644
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/devices/microblaze-softmmu.mak
diff --git a/default-configs/microblazeel-linux-user.mak b/default-configs/devices/microblazeel-linux-user.mak
index 378c6dd..378c6dd 100644
--- a/default-configs/microblazeel-linux-user.mak
+++ b/default-configs/devices/microblazeel-linux-user.mak
diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/devices/microblazeel-softmmu.mak
index 2fcf442..2fcf442 100644
--- a/default-configs/microblazeel-softmmu.mak
+++ b/default-configs/devices/microblazeel-softmmu.mak
diff --git a/default-configs/mips-linux-user.mak b/default-configs/devices/mips-linux-user.mak
index 31df570..31df570 100644
--- a/default-configs/mips-linux-user.mak
+++ b/default-configs/devices/mips-linux-user.mak
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak
index da29c6c..da29c6c 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/devices/mips-softmmu-common.mak
diff --git a/default-configs/mips-softmmu.mak b/default-configs/devices/mips-softmmu.mak
index 9fede6e..9fede6e 100644
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/devices/mips-softmmu.mak
diff --git a/default-configs/mips64-linux-user.mak b/default-configs/devices/mips64-linux-user.mak
index 1598bfc..1598bfc 100644
--- a/default-configs/mips64-linux-user.mak
+++ b/default-configs/devices/mips64-linux-user.mak
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/devices/mips64-softmmu.mak
index a169738..a169738 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/devices/mips64-softmmu.mak
diff --git a/default-configs/mips64el-linux-user.mak b/default-configs/devices/mips64el-linux-user.mak
index 629f084..629f084 100644
--- a/default-configs/mips64el-linux-user.mak
+++ b/default-configs/devices/mips64el-linux-user.mak
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/devices/mips64el-softmmu.mak
index 9f8a3ef..9f8a3ef 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/devices/mips64el-softmmu.mak
diff --git a/default-configs/mipsel-linux-user.mak b/default-configs/devices/mipsel-linux-user.mak
index 4d0e4af..4d0e4af 100644
--- a/default-configs/mipsel-linux-user.mak
+++ b/default-configs/devices/mipsel-linux-user.mak
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/devices/mipsel-softmmu.mak
index a7f6059..a7f6059 100644
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/devices/mipsel-softmmu.mak
diff --git a/default-configs/mipsn32-linux-user.mak b/default-configs/devices/mipsn32-linux-user.mak
index 5b97919..5b97919 100644
--- a/default-configs/mipsn32-linux-user.mak
+++ b/default-configs/devices/mipsn32-linux-user.mak
diff --git a/default-configs/mipsn32el-linux-user.mak b/default-configs/devices/mipsn32el-linux-user.mak
index d6367ff..d6367ff 100644
--- a/default-configs/mipsn32el-linux-user.mak
+++ b/default-configs/devices/mipsn32el-linux-user.mak
diff --git a/default-configs/moxie-softmmu.mak b/default-configs/devices/moxie-softmmu.mak
index bd50da3..bd50da3 100644
--- a/default-configs/moxie-softmmu.mak
+++ b/default-configs/devices/moxie-softmmu.mak
diff --git a/default-configs/nios2-linux-user.mak b/default-configs/devices/nios2-linux-user.mak
index 5be3eb7..5be3eb7 100644
--- a/default-configs/nios2-linux-user.mak
+++ b/default-configs/devices/nios2-linux-user.mak
diff --git a/default-configs/nios2-softmmu.mak b/default-configs/devices/nios2-softmmu.mak
index 1bc4082..1bc4082 100644
--- a/default-configs/nios2-softmmu.mak
+++ b/default-configs/devices/nios2-softmmu.mak
diff --git a/default-configs/or1k-linux-user.mak b/default-configs/devices/or1k-linux-user.mak
index 20e03c1..20e03c1 100644
--- a/default-configs/or1k-linux-user.mak
+++ b/default-configs/devices/or1k-linux-user.mak
diff --git a/default-configs/or1k-softmmu.mak b/default-configs/devices/or1k-softmmu.mak
index 168101c..168101c 100644
--- a/default-configs/or1k-softmmu.mak
+++ b/default-configs/devices/or1k-softmmu.mak
diff --git a/default-configs/ppc-linux-user.mak b/default-configs/devices/ppc-linux-user.mak
index 6273df2..6273df2 100644
--- a/default-configs/ppc-linux-user.mak
+++ b/default-configs/devices/ppc-linux-user.mak
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/devices/ppc-softmmu.mak
index 61b78b8..61b78b8 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/devices/ppc-softmmu.mak
diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/devices/ppc64-linux-user.mak
index 422d3fb..422d3fb 100644
--- a/default-configs/ppc64-linux-user.mak
+++ b/default-configs/devices/ppc64-linux-user.mak
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/devices/ppc64-softmmu.mak
index ae0841f..ae0841f 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/devices/ppc64-softmmu.mak
diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/devices/ppc64abi32-linux-user.mak
index 1c657ec..1c657ec 100644
--- a/default-configs/ppc64abi32-linux-user.mak
+++ b/default-configs/devices/ppc64abi32-linux-user.mak
diff --git a/default-configs/ppc64le-linux-user.mak b/default-configs/devices/ppc64le-linux-user.mak
index 63f4269..63f4269 100644
--- a/default-configs/ppc64le-linux-user.mak
+++ b/default-configs/devices/ppc64le-linux-user.mak
diff --git a/default-configs/riscv32-linux-user.mak b/default-configs/devices/riscv32-linux-user.mak
index 865b362..865b362 100644
--- a/default-configs/riscv32-linux-user.mak
+++ b/default-configs/devices/riscv32-linux-user.mak
diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/devices/riscv32-softmmu.mak
index 94a236c..94a236c 100644
--- a/default-configs/riscv32-softmmu.mak
+++ b/default-configs/devices/riscv32-softmmu.mak
diff --git a/default-configs/riscv64-linux-user.mak b/default-configs/devices/riscv64-linux-user.mak
index 865b362..865b362 100644
--- a/default-configs/riscv64-linux-user.mak
+++ b/default-configs/devices/riscv64-linux-user.mak
diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/devices/riscv64-softmmu.mak
index 76b6195..76b6195 100644
--- a/default-configs/riscv64-softmmu.mak
+++ b/default-configs/devices/riscv64-softmmu.mak
diff --git a/default-configs/rx-softmmu.mak b/default-configs/devices/rx-softmmu.mak
index df2b4e4..df2b4e4 100644
--- a/default-configs/rx-softmmu.mak
+++ b/default-configs/devices/rx-softmmu.mak
diff --git a/default-configs/s390x-linux-user.mak b/default-configs/devices/s390x-linux-user.mak
index a243c99..a243c99 100644
--- a/default-configs/s390x-linux-user.mak
+++ b/default-configs/devices/s390x-linux-user.mak
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/devices/s390x-softmmu.mak
index f2287a1..f2287a1 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/devices/s390x-softmmu.mak
diff --git a/default-configs/sh4-linux-user.mak b/default-configs/devices/sh4-linux-user.mak
index a469e19..a469e19 100644
--- a/default-configs/sh4-linux-user.mak
+++ b/default-configs/devices/sh4-linux-user.mak
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/devices/sh4-softmmu.mak
index 565e8b0..565e8b0 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/devices/sh4-softmmu.mak
diff --git a/default-configs/sh4eb-linux-user.mak b/default-configs/devices/sh4eb-linux-user.mak
index be08ca1..be08ca1 100644
--- a/default-configs/sh4eb-linux-user.mak
+++ b/default-configs/devices/sh4eb-linux-user.mak
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/devices/sh4eb-softmmu.mak
index 522a7a5..522a7a5 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/devices/sh4eb-softmmu.mak
diff --git a/default-configs/sparc-bsd-user.mak b/default-configs/devices/sparc-bsd-user.mak
index 21e0950..21e0950 100644
--- a/default-configs/sparc-bsd-user.mak
+++ b/default-configs/devices/sparc-bsd-user.mak
diff --git a/default-configs/sparc-linux-user.mak b/default-configs/devices/sparc-linux-user.mak
index 9c716d1..9c716d1 100644
--- a/default-configs/sparc-linux-user.mak
+++ b/default-configs/devices/sparc-linux-user.mak
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/devices/sparc-softmmu.mak
index ee85218..ee85218 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/devices/sparc-softmmu.mak
diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/devices/sparc32plus-linux-user.mak
index 432e880..432e880 100644
--- a/default-configs/sparc32plus-linux-user.mak
+++ b/default-configs/devices/sparc32plus-linux-user.mak
diff --git a/default-configs/sparc64-bsd-user.mak b/default-configs/devices/sparc64-bsd-user.mak
index b8b9eea..b8b9eea 100644
--- a/default-configs/sparc64-bsd-user.mak
+++ b/default-configs/devices/sparc64-bsd-user.mak
diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/devices/sparc64-linux-user.mak
index bf1bdd6..bf1bdd6 100644
--- a/default-configs/sparc64-linux-user.mak
+++ b/default-configs/devices/sparc64-linux-user.mak
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/devices/sparc64-softmmu.mak
index e50030a..e50030a 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/devices/sparc64-softmmu.mak
diff --git a/default-configs/tilegx-linux-user.mak b/default-configs/devices/tilegx-linux-user.mak
index 3e47493..3e47493 100644
--- a/default-configs/tilegx-linux-user.mak
+++ b/default-configs/devices/tilegx-linux-user.mak
diff --git a/default-configs/tricore-softmmu.mak b/default-configs/devices/tricore-softmmu.mak
index c397cff..c397cff 100644
--- a/default-configs/tricore-softmmu.mak
+++ b/default-configs/devices/tricore-softmmu.mak
diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/devices/unicore32-softmmu.mak
index 899288e..899288e 100644
--- a/default-configs/unicore32-softmmu.mak
+++ b/default-configs/devices/unicore32-softmmu.mak
diff --git a/default-configs/x86_64-bsd-user.mak b/default-configs/devices/x86_64-bsd-user.mak
index 73e5d34..73e5d34 100644
--- a/default-configs/x86_64-bsd-user.mak
+++ b/default-configs/devices/x86_64-bsd-user.mak
diff --git a/default-configs/x86_64-linux-user.mak b/default-configs/devices/x86_64-linux-user.mak
index bec1d9e..bec1d9e 100644
--- a/default-configs/x86_64-linux-user.mak
+++ b/default-configs/devices/x86_64-linux-user.mak
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/devices/x86_64-softmmu.mak
index 64b2ee2..64b2ee2 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/devices/x86_64-softmmu.mak
diff --git a/default-configs/xtensa-linux-user.mak b/default-configs/devices/xtensa-linux-user.mak
index fd1d350..fd1d350 100644
--- a/default-configs/xtensa-linux-user.mak
+++ b/default-configs/devices/xtensa-linux-user.mak
diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/devices/xtensa-softmmu.mak
index 4fe1bf0..4fe1bf0 100644
--- a/default-configs/xtensa-softmmu.mak
+++ b/default-configs/devices/xtensa-softmmu.mak
diff --git a/default-configs/xtensaeb-linux-user.mak b/default-configs/devices/xtensaeb-linux-user.mak
index fd1d350..fd1d350 100644
--- a/default-configs/xtensaeb-linux-user.mak
+++ b/default-configs/devices/xtensaeb-linux-user.mak
diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/devices/xtensaeb-softmmu.mak
index f7e48c7..f7e48c7 100644
--- a/default-configs/xtensaeb-softmmu.mak
+++ b/default-configs/devices/xtensaeb-softmmu.mak
diff --git a/meson.build b/meson.build
index 0f0cc21..41e5763 100644
--- a/meson.build
+++ b/meson.build
@@ -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,