diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-02-22 10:39:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-02-22 10:39:52 +0100 |
| commit | 2575ef9d523e8aa1f7a187c44cdff9dc8ee172d3 (patch) | |
| tree | 214ac1a690a32e97b34c32f890b6269d53aa0dd6 /arch | |
| parent | a97e0b863eefb4a1025e39429cabf67b3ea34b72 (diff) | |
| parent | 8b357213cf4ba80cce86fcbee88d2b237d67e066 (diff) | |
| download | barebox-2575ef9d523e8aa1f7a187c44cdff9dc8ee172d3.tar.gz barebox-2575ef9d523e8aa1f7a187c44cdff9dc8ee172d3.tar.xz | |
Merge branch 'for-next/virtio'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/vexpress_defconfig | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index 760e39b440..d58ca7ebd0 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig @@ -1,6 +1,6 @@ CONFIG_ARCH_VEXPRESS=y -CONFIG_MACH_VIRT=y CONFIG_MACH_VEXPRESS=y +CONFIG_MACH_VIRT=y CONFIG_AEABI=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_MALLOC_SIZE=0x0 @@ -14,6 +14,9 @@ CONFIG_MENU=y CONFIG_BOOTM_SHOW_TYPE=y CONFIG_BOOTM_VERBOSE=y CONFIG_BOOTM_INITRD=y +CONFIG_CONSOLE_ACTIVATE_ALL=y +CONFIG_CONSOLE_ALLOW_COLOR=y +CONFIG_PARTITION_DISK_EFI=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_CMD_DMESG=y CONFIG_LONGHELP=y @@ -28,6 +31,7 @@ CONFIG_CMD_PARTITION=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_FILETYPE=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y @@ -45,21 +49,28 @@ CONFIG_CMD_CRC=y CONFIG_CMD_CRC_CMP=y CONFIG_CMD_CLK=y CONFIG_CMD_DETECT=y +CONFIG_CMD_POWEROFF=y CONFIG_CMD_OFTREE=y CONFIG_NET=y CONFIG_NET_NFS=y CONFIG_NET_NETCONSOLE=y CONFIG_OF_BAREBOX_DRIVERS=y -CONFIG_OF_OVERLAY=y CONFIG_SERIAL_AMBA_PL011=y +CONFIG_VIRTIO_CONSOLE=y CONFIG_DRIVER_NET_SMC91111=y # CONFIG_SPI is not set CONFIG_MTD=y CONFIG_MTD_CONCAT=y CONFIG_DRIVER_CFI=y +CONFIG_VIRTIO_BLK=y CONFIG_MCI=y CONFIG_MCI_MMCI=y +CONFIG_HWRNG=y +CONFIG_HW_RANDOM_VIRTIO=y # CONFIG_PINCTRL is not set +CONFIG_VIRTIO_MMIO=y +CONFIG_FS_EXT4=y CONFIG_FS_TFTP=y +CONFIG_FS_FAT=y CONFIG_DIGEST_SHA1_GENERIC=y CONFIG_DIGEST_SHA256_GENERIC=y |