The ARM64 QEMU Virt board is now enabled in multi_v8_defconfig. Remove
the now unnecessary defconfig.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/Makefile | 2 +-
arch/arm/configs/qemu_virt64_defconfig | 108 ------------------
...defconfig.yaml => multi_v8_defconfig.yaml} | 0
3 files changed, 1 insertion(+), 109 deletions(-)
delete mode 100644 arch/arm/configs/qemu_virt64_defconfig
rename test/arm/{qemu_virt64_defconfig.yaml => multi_v8_defconfig.yaml} (100%)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index a506f1e3a3..69da1f306d 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
-KBUILD_DEFCONFIG := qemu_virt64_defconfig
+KBUILD_DEFCONFIG := multi_v8_defconfig
KBUILD_CPPFLAGS += -D__ARM__ -fno-strict-aliasing
# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
diff --git a/arch/arm/configs/qemu_virt64_defconfig b/arch/arm/configs/qemu_virt64_defconfig
deleted file mode 100644
index f9265cb3a3..0000000000
--- a/arch/arm/configs/qemu_virt64_defconfig
+++ /dev/null
@@ -1,108 +0,0 @@
-CONFIG_ARCH_ARM64_VIRT=y
-CONFIG_64BIT=y
-CONFIG_ARM_PSCI_CLIENT=y
-CONFIG_MALLOC_SIZE=0x0
-CONFIG_KALLSYMS=y
-CONFIG_PROMPT=""
-CONFIG_HUSH_FANCY_PROMPT=y
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_MENU=y
-CONFIG_BOOTM_INITRD=y
-CONFIG_BLSPEC=y
-CONFIG_CONSOLE_ACTIVATE_NONE=y
-CONFIG_CONSOLE_ALLOW_COLOR=y
-CONFIG_PARTITION_DISK_EFI=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_STATE=y
-CONFIG_BOOTCHOOSER=y
-CONFIG_RESET_SOURCE=y
-CONFIG_MACHINE_ID=y
-CONFIG_LONGHELP=y
-CONFIG_CMD_IOMEM=y
-CONFIG_CMD_IMD=y
-CONFIG_CMD_MEMINFO=y
-CONFIG_CMD_POLLER=y
-CONFIG_CMD_SLICE=y
-CONFIG_CMD_GO=y
-CONFIG_CMD_LOADB=y
-CONFIG_CMD_RESET=y
-CONFIG_CMD_UIMAGE=y
-CONFIG_CMD_BOOTCHOOSER=y
-CONFIG_CMD_PARTITION=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_MAGICVAR=y
-CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_FILETYPE=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_SHA256SUM=y
-CONFIG_CMD_UNCOMPRESS=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_LOGIN=y
-CONFIG_CMD_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_PASSWD=y
-CONFIG_CMD_SPLASH=y
-CONFIG_CMD_FBTEST=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TIMEOUT=y
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_DETECT=y
-CONFIG_CMD_FLASH=y
-CONFIG_CMD_POWEROFF=y
-CONFIG_CMD_SMC=y
-CONFIG_CMD_BAREBOX_UPDATE=y
-CONFIG_CMD_OF_DIFF=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_OF_PROPERTY=y
-CONFIG_CMD_OF_DISPLAY_TIMINGS=y
-CONFIG_CMD_OF_FIXUP_STATUS=y
-CONFIG_CMD_OF_OVERLAY=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_STATE=y
-CONFIG_NET=y
-CONFIG_NET_NFS=y
-CONFIG_NET_NETCONSOLE=y
-CONFIG_NET_DHCP=y
-CONFIG_NET_SNTP=y
-CONFIG_NET_FASTBOOT=y
-CONFIG_OF_BAREBOX_DRIVERS=y
-CONFIG_OF_BAREBOX_ENV_IN_FS=y
-CONFIG_OF_OVERLAY_LIVE=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_DRIVER_NET_VIRTIO=y
-# CONFIG_SPI is not set
-CONFIG_MTD=y
-CONFIG_DRIVER_CFI=y
-CONFIG_CFI_BUFFER_WRITE=y
-CONFIG_DISK=y
-CONFIG_DISK_WRITE=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIDEO=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_DRIVER_VIDEO_BOCHS_PCI=y
-CONFIG_SOUND=y
-CONFIG_STATE_DRV=y
-CONFIG_VIRTIO_INPUT=y
-CONFIG_HWRNG=y
-CONFIG_HW_RANDOM_VIRTIO=y
-# CONFIG_PINCTRL is not set
-CONFIG_NVMEM=y
-CONFIG_NVMEM_RMEM=y
-CONFIG_PCI_ECAM_GENERIC=y
-CONFIG_NVMEM_REBOOT_MODE=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_FS_EXT4=y
-CONFIG_FS_NFS=y
-CONFIG_FS_FAT=y
-CONFIG_FS_PSTORE=y
-CONFIG_FS_PSTORE_CONSOLE=y
-CONFIG_DIGEST_SHA1_GENERIC=y
diff --git a/test/arm/qemu_virt64_defconfig.yaml b/test/arm/multi_v8_defconfig.yaml
similarity index 100%
rename from test/arm/qemu_virt64_defconfig.yaml
rename to test/arm/multi_v8_defconfig.yaml
--
2.39.2
