From 1bb4cb1c33805c0da0db5b76852bb73759625c4e Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 18 Sep 2020 06:06:09 -0400 Subject: [PATCH] default-configs: move files to default-configs/devices/ Make room for target files in default-configs/targets/ Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 6 +++--- default-configs/{ => devices}/aarch64-linux-user.mak | 0 default-configs/{ => devices}/aarch64-softmmu.mak | 0 default-configs/{ => devices}/aarch64_be-linux-user.mak | 0 default-configs/{ => devices}/alpha-linux-user.mak | 0 default-configs/{ => devices}/alpha-softmmu.mak | 0 default-configs/{ => devices}/arm-linux-user.mak | 0 default-configs/{ => devices}/arm-softmmu.mak | 0 default-configs/{ => devices}/armeb-linux-user.mak | 0 default-configs/{ => devices}/avr-softmmu.mak | 0 default-configs/{ => devices}/cris-linux-user.mak | 0 default-configs/{ => devices}/cris-softmmu.mak | 0 default-configs/{ => devices}/hppa-linux-user.mak | 0 default-configs/{ => devices}/hppa-softmmu.mak | 0 default-configs/{ => devices}/i386-bsd-user.mak | 0 default-configs/{ => devices}/i386-linux-user.mak | 0 default-configs/{ => devices}/i386-softmmu.mak | 0 default-configs/{ => devices}/lm32-softmmu.mak | 0 default-configs/{ => devices}/m68k-linux-user.mak | 0 default-configs/{ => devices}/m68k-softmmu.mak | 0 default-configs/{ => devices}/microblaze-linux-user.mak | 0 default-configs/{ => devices}/microblaze-softmmu.mak | 0 default-configs/{ => devices}/microblazeel-linux-user.mak | 0 default-configs/{ => devices}/microblazeel-softmmu.mak | 0 default-configs/{ => devices}/mips-linux-user.mak | 0 default-configs/{ => devices}/mips-softmmu-common.mak | 0 default-configs/{ => devices}/mips-softmmu.mak | 0 default-configs/{ => devices}/mips64-linux-user.mak | 0 default-configs/{ => devices}/mips64-softmmu.mak | 0 default-configs/{ => devices}/mips64el-linux-user.mak | 0 default-configs/{ => devices}/mips64el-softmmu.mak | 0 default-configs/{ => devices}/mipsel-linux-user.mak | 0 default-configs/{ => devices}/mipsel-softmmu.mak | 0 default-configs/{ => devices}/mipsn32-linux-user.mak | 0 default-configs/{ => devices}/mipsn32el-linux-user.mak | 0 default-configs/{ => devices}/moxie-softmmu.mak | 0 default-configs/{ => devices}/nios2-linux-user.mak | 0 default-configs/{ => devices}/nios2-softmmu.mak | 0 default-configs/{ => devices}/or1k-linux-user.mak | 0 default-configs/{ => devices}/or1k-softmmu.mak | 0 default-configs/{ => devices}/ppc-linux-user.mak | 0 default-configs/{ => devices}/ppc-softmmu.mak | 0 default-configs/{ => devices}/ppc64-linux-user.mak | 0 default-configs/{ => devices}/ppc64-softmmu.mak | 0 default-configs/{ => devices}/ppc64abi32-linux-user.mak | 0 default-configs/{ => devices}/ppc64le-linux-user.mak | 0 default-configs/{ => devices}/riscv32-linux-user.mak | 0 default-configs/{ => devices}/riscv32-softmmu.mak | 0 default-configs/{ => devices}/riscv64-linux-user.mak | 0 default-configs/{ => devices}/riscv64-softmmu.mak | 0 default-configs/{ => devices}/rx-softmmu.mak | 0 default-configs/{ => devices}/s390x-linux-user.mak | 0 default-configs/{ => devices}/s390x-softmmu.mak | 0 default-configs/{ => devices}/sh4-linux-user.mak | 0 default-configs/{ => devices}/sh4-softmmu.mak | 0 default-configs/{ => devices}/sh4eb-linux-user.mak | 0 default-configs/{ => devices}/sh4eb-softmmu.mak | 0 default-configs/{ => devices}/sparc-bsd-user.mak | 0 default-configs/{ => devices}/sparc-linux-user.mak | 0 default-configs/{ => devices}/sparc-softmmu.mak | 0 default-configs/{ => devices}/sparc32plus-linux-user.mak | 0 default-configs/{ => devices}/sparc64-bsd-user.mak | 0 default-configs/{ => devices}/sparc64-linux-user.mak | 0 default-configs/{ => devices}/sparc64-softmmu.mak | 0 default-configs/{ => devices}/tilegx-linux-user.mak | 0 default-configs/{ => devices}/tricore-softmmu.mak | 0 default-configs/{ => devices}/unicore32-softmmu.mak | 0 default-configs/{ => devices}/x86_64-bsd-user.mak | 0 default-configs/{ => devices}/x86_64-linux-user.mak | 0 default-configs/{ => devices}/x86_64-softmmu.mak | 0 default-configs/{ => devices}/xtensa-linux-user.mak | 0 default-configs/{ => devices}/xtensa-softmmu.mak | 0 default-configs/{ => devices}/xtensaeb-linux-user.mak | 0 default-configs/{ => devices}/xtensaeb-softmmu.mak | 0 meson.build | 2 +- 75 files changed, 4 insertions(+), 4 deletions(-) rename default-configs/{ => devices}/aarch64-linux-user.mak (100%) rename default-configs/{ => devices}/aarch64-softmmu.mak (100%) rename default-configs/{ => devices}/aarch64_be-linux-user.mak (100%) rename default-configs/{ => devices}/alpha-linux-user.mak (100%) rename default-configs/{ => devices}/alpha-softmmu.mak (100%) rename default-configs/{ => devices}/arm-linux-user.mak (100%) rename default-configs/{ => devices}/arm-softmmu.mak (100%) rename default-configs/{ => devices}/armeb-linux-user.mak (100%) rename default-configs/{ => devices}/avr-softmmu.mak (100%) rename default-configs/{ => devices}/cris-linux-user.mak (100%) rename default-configs/{ => devices}/cris-softmmu.mak (100%) rename default-configs/{ => devices}/hppa-linux-user.mak (100%) rename default-configs/{ => devices}/hppa-softmmu.mak (100%) rename default-configs/{ => devices}/i386-bsd-user.mak (100%) rename default-configs/{ => devices}/i386-linux-user.mak (100%) rename default-configs/{ => devices}/i386-softmmu.mak (100%) rename default-configs/{ => devices}/lm32-softmmu.mak (100%) rename default-configs/{ => devices}/m68k-linux-user.mak (100%) rename default-configs/{ => devices}/m68k-softmmu.mak (100%) rename default-configs/{ => devices}/microblaze-linux-user.mak (100%) rename default-configs/{ => devices}/microblaze-softmmu.mak (100%) rename default-configs/{ => devices}/microblazeel-linux-user.mak (100%) rename default-configs/{ => devices}/microblazeel-softmmu.mak (100%) rename default-configs/{ => devices}/mips-linux-user.mak (100%) rename default-configs/{ => devices}/mips-softmmu-common.mak (100%) rename default-configs/{ => devices}/mips-softmmu.mak (100%) rename default-configs/{ => devices}/mips64-linux-user.mak (100%) rename default-configs/{ => devices}/mips64-softmmu.mak (100%) rename default-configs/{ => devices}/mips64el-linux-user.mak (100%) rename default-configs/{ => devices}/mips64el-softmmu.mak (100%) rename default-configs/{ => devices}/mipsel-linux-user.mak (100%) rename default-configs/{ => devices}/mipsel-softmmu.mak (100%) rename default-configs/{ => devices}/mipsn32-linux-user.mak (100%) rename default-configs/{ => devices}/mipsn32el-linux-user.mak (100%) rename default-configs/{ => devices}/moxie-softmmu.mak (100%) rename default-configs/{ => devices}/nios2-linux-user.mak (100%) rename default-configs/{ => devices}/nios2-softmmu.mak (100%) rename default-configs/{ => devices}/or1k-linux-user.mak (100%) rename default-configs/{ => devices}/or1k-softmmu.mak (100%) rename default-configs/{ => devices}/ppc-linux-user.mak (100%) rename default-configs/{ => devices}/ppc-softmmu.mak (100%) rename default-configs/{ => devices}/ppc64-linux-user.mak (100%) rename default-configs/{ => devices}/ppc64-softmmu.mak (100%) rename default-configs/{ => devices}/ppc64abi32-linux-user.mak (100%) rename default-configs/{ => devices}/ppc64le-linux-user.mak (100%) rename default-configs/{ => devices}/riscv32-linux-user.mak (100%) rename default-configs/{ => devices}/riscv32-softmmu.mak (100%) rename default-configs/{ => devices}/riscv64-linux-user.mak (100%) rename default-configs/{ => devices}/riscv64-softmmu.mak (100%) rename default-configs/{ => devices}/rx-softmmu.mak (100%) rename default-configs/{ => devices}/s390x-linux-user.mak (100%) rename default-configs/{ => devices}/s390x-softmmu.mak (100%) rename default-configs/{ => devices}/sh4-linux-user.mak (100%) rename default-configs/{ => devices}/sh4-softmmu.mak (100%) rename default-configs/{ => devices}/sh4eb-linux-user.mak (100%) rename default-configs/{ => devices}/sh4eb-softmmu.mak (100%) rename default-configs/{ => devices}/sparc-bsd-user.mak (100%) rename default-configs/{ => devices}/sparc-linux-user.mak (100%) rename default-configs/{ => devices}/sparc-softmmu.mak (100%) rename default-configs/{ => devices}/sparc32plus-linux-user.mak (100%) rename default-configs/{ => devices}/sparc64-bsd-user.mak (100%) rename default-configs/{ => devices}/sparc64-linux-user.mak (100%) rename default-configs/{ => devices}/sparc64-softmmu.mak (100%) rename default-configs/{ => devices}/tilegx-linux-user.mak (100%) rename default-configs/{ => devices}/tricore-softmmu.mak (100%) rename default-configs/{ => devices}/unicore32-softmmu.mak (100%) rename default-configs/{ => devices}/x86_64-bsd-user.mak (100%) rename default-configs/{ => devices}/x86_64-linux-user.mak (100%) rename default-configs/{ => devices}/x86_64-softmmu.mak (100%) rename default-configs/{ => devices}/xtensa-linux-user.mak (100%) rename default-configs/{ => devices}/xtensa-softmmu.mak (100%) rename default-configs/{ => devices}/xtensaeb-linux-user.mak (100%) rename default-configs/{ => devices}/xtensaeb-softmmu.mak (100%) diff --git a/configure b/configure index a5841241be..1981f58aa9 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 similarity index 100% rename from default-configs/aarch64-linux-user.mak rename to default-configs/devices/aarch64-linux-user.mak diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/devices/aarch64-softmmu.mak similarity index 100% rename from default-configs/aarch64-softmmu.mak rename to 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 similarity index 100% rename from default-configs/aarch64_be-linux-user.mak rename to 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 similarity index 100% rename from default-configs/alpha-linux-user.mak rename to default-configs/devices/alpha-linux-user.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/devices/alpha-softmmu.mak similarity index 100% rename from default-configs/alpha-softmmu.mak rename to default-configs/devices/alpha-softmmu.mak diff --git a/default-configs/arm-linux-user.mak b/default-configs/devices/arm-linux-user.mak similarity index 100% rename from default-configs/arm-linux-user.mak rename to default-configs/devices/arm-linux-user.mak diff --git a/default-configs/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak similarity index 100% rename from default-configs/arm-softmmu.mak rename to default-configs/devices/arm-softmmu.mak diff --git a/default-configs/armeb-linux-user.mak b/default-configs/devices/armeb-linux-user.mak similarity index 100% rename from default-configs/armeb-linux-user.mak rename to default-configs/devices/armeb-linux-user.mak diff --git a/default-configs/avr-softmmu.mak b/default-configs/devices/avr-softmmu.mak similarity index 100% rename from default-configs/avr-softmmu.mak rename to default-configs/devices/avr-softmmu.mak diff --git a/default-configs/cris-linux-user.mak b/default-configs/devices/cris-linux-user.mak similarity index 100% rename from default-configs/cris-linux-user.mak rename to default-configs/devices/cris-linux-user.mak diff --git a/default-configs/cris-softmmu.mak b/default-configs/devices/cris-softmmu.mak similarity index 100% rename from default-configs/cris-softmmu.mak rename to default-configs/devices/cris-softmmu.mak diff --git a/default-configs/hppa-linux-user.mak b/default-configs/devices/hppa-linux-user.mak similarity index 100% rename from default-configs/hppa-linux-user.mak rename to default-configs/devices/hppa-linux-user.mak diff --git a/default-configs/hppa-softmmu.mak b/default-configs/devices/hppa-softmmu.mak similarity index 100% rename from default-configs/hppa-softmmu.mak rename to default-configs/devices/hppa-softmmu.mak diff --git a/default-configs/i386-bsd-user.mak b/default-configs/devices/i386-bsd-user.mak similarity index 100% rename from default-configs/i386-bsd-user.mak rename to default-configs/devices/i386-bsd-user.mak diff --git a/default-configs/i386-linux-user.mak b/default-configs/devices/i386-linux-user.mak similarity index 100% rename from default-configs/i386-linux-user.mak rename to default-configs/devices/i386-linux-user.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/devices/i386-softmmu.mak similarity index 100% rename from default-configs/i386-softmmu.mak rename to default-configs/devices/i386-softmmu.mak diff --git a/default-configs/lm32-softmmu.mak b/default-configs/devices/lm32-softmmu.mak similarity index 100% rename from default-configs/lm32-softmmu.mak rename to default-configs/devices/lm32-softmmu.mak diff --git a/default-configs/m68k-linux-user.mak b/default-configs/devices/m68k-linux-user.mak similarity index 100% rename from default-configs/m68k-linux-user.mak rename to default-configs/devices/m68k-linux-user.mak diff --git a/default-configs/m68k-softmmu.mak b/default-configs/devices/m68k-softmmu.mak similarity index 100% rename from default-configs/m68k-softmmu.mak rename to default-configs/devices/m68k-softmmu.mak diff --git a/default-configs/microblaze-linux-user.mak b/default-configs/devices/microblaze-linux-user.mak similarity index 100% rename from default-configs/microblaze-linux-user.mak rename to default-configs/devices/microblaze-linux-user.mak diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/devices/microblaze-softmmu.mak similarity index 100% rename from default-configs/microblaze-softmmu.mak rename to default-configs/devices/microblaze-softmmu.mak diff --git a/default-configs/microblazeel-linux-user.mak b/default-configs/devices/microblazeel-linux-user.mak similarity index 100% rename from default-configs/microblazeel-linux-user.mak rename to default-configs/devices/microblazeel-linux-user.mak diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/devices/microblazeel-softmmu.mak similarity index 100% rename from default-configs/microblazeel-softmmu.mak rename to default-configs/devices/microblazeel-softmmu.mak diff --git a/default-configs/mips-linux-user.mak b/default-configs/devices/mips-linux-user.mak similarity index 100% rename from default-configs/mips-linux-user.mak rename to default-configs/devices/mips-linux-user.mak diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak similarity index 100% rename from default-configs/mips-softmmu-common.mak rename to default-configs/devices/mips-softmmu-common.mak diff --git a/default-configs/mips-softmmu.mak b/default-configs/devices/mips-softmmu.mak similarity index 100% rename from default-configs/mips-softmmu.mak rename to default-configs/devices/mips-softmmu.mak diff --git a/default-configs/mips64-linux-user.mak b/default-configs/devices/mips64-linux-user.mak similarity index 100% rename from default-configs/mips64-linux-user.mak rename to default-configs/devices/mips64-linux-user.mak diff --git a/default-configs/mips64-softmmu.mak b/default-configs/devices/mips64-softmmu.mak similarity index 100% rename from default-configs/mips64-softmmu.mak rename to default-configs/devices/mips64-softmmu.mak diff --git a/default-configs/mips64el-linux-user.mak b/default-configs/devices/mips64el-linux-user.mak similarity index 100% rename from default-configs/mips64el-linux-user.mak rename to default-configs/devices/mips64el-linux-user.mak diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/devices/mips64el-softmmu.mak similarity index 100% rename from default-configs/mips64el-softmmu.mak rename to default-configs/devices/mips64el-softmmu.mak diff --git a/default-configs/mipsel-linux-user.mak b/default-configs/devices/mipsel-linux-user.mak similarity index 100% rename from default-configs/mipsel-linux-user.mak rename to default-configs/devices/mipsel-linux-user.mak diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/devices/mipsel-softmmu.mak similarity index 100% rename from default-configs/mipsel-softmmu.mak rename to default-configs/devices/mipsel-softmmu.mak diff --git a/default-configs/mipsn32-linux-user.mak b/default-configs/devices/mipsn32-linux-user.mak similarity index 100% rename from default-configs/mipsn32-linux-user.mak rename to default-configs/devices/mipsn32-linux-user.mak diff --git a/default-configs/mipsn32el-linux-user.mak b/default-configs/devices/mipsn32el-linux-user.mak similarity index 100% rename from default-configs/mipsn32el-linux-user.mak rename to default-configs/devices/mipsn32el-linux-user.mak diff --git a/default-configs/moxie-softmmu.mak b/default-configs/devices/moxie-softmmu.mak similarity index 100% rename from default-configs/moxie-softmmu.mak rename to default-configs/devices/moxie-softmmu.mak diff --git a/default-configs/nios2-linux-user.mak b/default-configs/devices/nios2-linux-user.mak similarity index 100% rename from default-configs/nios2-linux-user.mak rename to default-configs/devices/nios2-linux-user.mak diff --git a/default-configs/nios2-softmmu.mak b/default-configs/devices/nios2-softmmu.mak similarity index 100% rename from default-configs/nios2-softmmu.mak rename to default-configs/devices/nios2-softmmu.mak diff --git a/default-configs/or1k-linux-user.mak b/default-configs/devices/or1k-linux-user.mak similarity index 100% rename from default-configs/or1k-linux-user.mak rename to default-configs/devices/or1k-linux-user.mak diff --git a/default-configs/or1k-softmmu.mak b/default-configs/devices/or1k-softmmu.mak similarity index 100% rename from default-configs/or1k-softmmu.mak rename to default-configs/devices/or1k-softmmu.mak diff --git a/default-configs/ppc-linux-user.mak b/default-configs/devices/ppc-linux-user.mak similarity index 100% rename from default-configs/ppc-linux-user.mak rename to default-configs/devices/ppc-linux-user.mak diff --git a/default-configs/ppc-softmmu.mak b/default-configs/devices/ppc-softmmu.mak similarity index 100% rename from default-configs/ppc-softmmu.mak rename to default-configs/devices/ppc-softmmu.mak diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/devices/ppc64-linux-user.mak similarity index 100% rename from default-configs/ppc64-linux-user.mak rename to default-configs/devices/ppc64-linux-user.mak diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/devices/ppc64-softmmu.mak similarity index 100% rename from default-configs/ppc64-softmmu.mak rename to default-configs/devices/ppc64-softmmu.mak diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/devices/ppc64abi32-linux-user.mak similarity index 100% rename from default-configs/ppc64abi32-linux-user.mak rename to default-configs/devices/ppc64abi32-linux-user.mak diff --git a/default-configs/ppc64le-linux-user.mak b/default-configs/devices/ppc64le-linux-user.mak similarity index 100% rename from default-configs/ppc64le-linux-user.mak rename to default-configs/devices/ppc64le-linux-user.mak diff --git a/default-configs/riscv32-linux-user.mak b/default-configs/devices/riscv32-linux-user.mak similarity index 100% rename from default-configs/riscv32-linux-user.mak rename to default-configs/devices/riscv32-linux-user.mak diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/devices/riscv32-softmmu.mak similarity index 100% rename from default-configs/riscv32-softmmu.mak rename to default-configs/devices/riscv32-softmmu.mak diff --git a/default-configs/riscv64-linux-user.mak b/default-configs/devices/riscv64-linux-user.mak similarity index 100% rename from default-configs/riscv64-linux-user.mak rename to default-configs/devices/riscv64-linux-user.mak diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/devices/riscv64-softmmu.mak similarity index 100% rename from default-configs/riscv64-softmmu.mak rename to default-configs/devices/riscv64-softmmu.mak diff --git a/default-configs/rx-softmmu.mak b/default-configs/devices/rx-softmmu.mak similarity index 100% rename from default-configs/rx-softmmu.mak rename to default-configs/devices/rx-softmmu.mak diff --git a/default-configs/s390x-linux-user.mak b/default-configs/devices/s390x-linux-user.mak similarity index 100% rename from default-configs/s390x-linux-user.mak rename to default-configs/devices/s390x-linux-user.mak diff --git a/default-configs/s390x-softmmu.mak b/default-configs/devices/s390x-softmmu.mak similarity index 100% rename from default-configs/s390x-softmmu.mak rename to default-configs/devices/s390x-softmmu.mak diff --git a/default-configs/sh4-linux-user.mak b/default-configs/devices/sh4-linux-user.mak similarity index 100% rename from default-configs/sh4-linux-user.mak rename to default-configs/devices/sh4-linux-user.mak diff --git a/default-configs/sh4-softmmu.mak b/default-configs/devices/sh4-softmmu.mak similarity index 100% rename from default-configs/sh4-softmmu.mak rename to default-configs/devices/sh4-softmmu.mak diff --git a/default-configs/sh4eb-linux-user.mak b/default-configs/devices/sh4eb-linux-user.mak similarity index 100% rename from default-configs/sh4eb-linux-user.mak rename to default-configs/devices/sh4eb-linux-user.mak diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/devices/sh4eb-softmmu.mak similarity index 100% rename from default-configs/sh4eb-softmmu.mak rename to default-configs/devices/sh4eb-softmmu.mak diff --git a/default-configs/sparc-bsd-user.mak b/default-configs/devices/sparc-bsd-user.mak similarity index 100% rename from default-configs/sparc-bsd-user.mak rename to default-configs/devices/sparc-bsd-user.mak diff --git a/default-configs/sparc-linux-user.mak b/default-configs/devices/sparc-linux-user.mak similarity index 100% rename from default-configs/sparc-linux-user.mak rename to default-configs/devices/sparc-linux-user.mak diff --git a/default-configs/sparc-softmmu.mak b/default-configs/devices/sparc-softmmu.mak similarity index 100% rename from default-configs/sparc-softmmu.mak rename to default-configs/devices/sparc-softmmu.mak diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/devices/sparc32plus-linux-user.mak similarity index 100% rename from default-configs/sparc32plus-linux-user.mak rename to default-configs/devices/sparc32plus-linux-user.mak diff --git a/default-configs/sparc64-bsd-user.mak b/default-configs/devices/sparc64-bsd-user.mak similarity index 100% rename from default-configs/sparc64-bsd-user.mak rename to default-configs/devices/sparc64-bsd-user.mak diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/devices/sparc64-linux-user.mak similarity index 100% rename from default-configs/sparc64-linux-user.mak rename to default-configs/devices/sparc64-linux-user.mak diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/devices/sparc64-softmmu.mak similarity index 100% rename from default-configs/sparc64-softmmu.mak rename to default-configs/devices/sparc64-softmmu.mak diff --git a/default-configs/tilegx-linux-user.mak b/default-configs/devices/tilegx-linux-user.mak similarity index 100% rename from default-configs/tilegx-linux-user.mak rename to default-configs/devices/tilegx-linux-user.mak diff --git a/default-configs/tricore-softmmu.mak b/default-configs/devices/tricore-softmmu.mak similarity index 100% rename from default-configs/tricore-softmmu.mak rename to default-configs/devices/tricore-softmmu.mak diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/devices/unicore32-softmmu.mak similarity index 100% rename from default-configs/unicore32-softmmu.mak rename to 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 similarity index 100% rename from default-configs/x86_64-bsd-user.mak rename to 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 similarity index 100% rename from default-configs/x86_64-linux-user.mak rename to 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 similarity index 100% rename from default-configs/x86_64-softmmu.mak rename to default-configs/devices/x86_64-softmmu.mak diff --git a/default-configs/xtensa-linux-user.mak b/default-configs/devices/xtensa-linux-user.mak similarity index 100% rename from default-configs/xtensa-linux-user.mak rename to default-configs/devices/xtensa-linux-user.mak diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/devices/xtensa-softmmu.mak similarity index 100% rename from default-configs/xtensa-softmmu.mak rename to default-configs/devices/xtensa-softmmu.mak diff --git a/default-configs/xtensaeb-linux-user.mak b/default-configs/devices/xtensaeb-linux-user.mak similarity index 100% rename from default-configs/xtensaeb-linux-user.mak rename to default-configs/devices/xtensaeb-linux-user.mak diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/devices/xtensaeb-softmmu.mak similarity index 100% rename from default-configs/xtensaeb-softmmu.mak rename to default-configs/devices/xtensaeb-softmmu.mak diff --git a/meson.build b/meson.build index 0f0cc21d16..41e5763e75 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,