Messages in this thread |  | | Date | Mon, 02 Dec 2019 15:32:50 -0800 (PST) | From | Palmer Dabbelt <> | Subject | Re: [PATCH 2/4] RISC-V: Enable QEMU virt machine support in defconfigs |
| |
On Tue, 26 Nov 2019 11:14:37 PST (-0800), Atish Patra wrote: > On Mon, 2019-11-25 at 13:22 +0000, Anup Patel wrote: >> We have kconfig option for QEMU virt machine so let's enable it >> in RV32 and RV64 defconfigs. >> > > and remove the virt specific configs from defconfig. > > Bit more verbose commit text makes more sense here. > > >> Signed-off-by: Anup Patel <anup.patel@wdc.com> >> --- >> arch/riscv/configs/defconfig | 15 +-------------- >> arch/riscv/configs/rv32_defconfig | 16 +--------------- >> 2 files changed, 2 insertions(+), 29 deletions(-) >> >> diff --git a/arch/riscv/configs/defconfig >> b/arch/riscv/configs/defconfig >> index 420a0dbef386..2515fe6417e1 100644 >> --- a/arch/riscv/configs/defconfig >> +++ b/arch/riscv/configs/defconfig >> @@ -15,6 +15,7 @@ CONFIG_BLK_DEV_INITRD=y >> CONFIG_EXPERT=y >> CONFIG_BPF_SYSCALL=y >> CONFIG_SOC_SIFIVE=y >> +CONFIG_SOC_VIRT=y >> CONFIG_SMP=y >> CONFIG_MODULES=y >> CONFIG_MODULE_UNLOAD=y >> @@ -30,7 +31,6 @@ CONFIG_IP_PNP_BOOTP=y >> CONFIG_IP_PNP_RARP=y >> CONFIG_NETLINK_DIAG=y >> CONFIG_NET_9P=y >> -CONFIG_NET_9P_VIRTIO=y >> CONFIG_PCI=y >> CONFIG_PCIEPORTBUS=y >> CONFIG_PCI_HOST_GENERIC=y >> @@ -38,15 +38,12 @@ CONFIG_PCIE_XILINX=y >> CONFIG_DEVTMPFS=y >> CONFIG_DEVTMPFS_MOUNT=y >> CONFIG_BLK_DEV_LOOP=y >> -CONFIG_VIRTIO_BLK=y >> CONFIG_BLK_DEV_SD=y >> CONFIG_BLK_DEV_SR=y >> -CONFIG_SCSI_VIRTIO=y >> CONFIG_ATA=y >> CONFIG_SATA_AHCI=y >> CONFIG_SATA_AHCI_PLATFORM=y >> CONFIG_NETDEVICES=y >> -CONFIG_VIRTIO_NET=y >> CONFIG_MACB=y >> CONFIG_E1000E=y >> CONFIG_R8169=y >> @@ -57,15 +54,12 @@ CONFIG_SERIAL_8250_CONSOLE=y >> CONFIG_SERIAL_OF_PLATFORM=y >> CONFIG_SERIAL_EARLYCON_RISCV_SBI=y >> CONFIG_HVC_RISCV_SBI=y >> -CONFIG_VIRTIO_CONSOLE=y >> CONFIG_HW_RANDOM=y >> -CONFIG_HW_RANDOM_VIRTIO=y >> CONFIG_SPI=y >> CONFIG_SPI_SIFIVE=y >> # CONFIG_PTP_1588_CLOCK is not set >> CONFIG_DRM=y >> CONFIG_DRM_RADEON=y >> -CONFIG_DRM_VIRTIO_GPU=y >> CONFIG_FRAMEBUFFER_CONSOLE=y >> CONFIG_USB=y >> CONFIG_USB_XHCI_HCD=y >> @@ -78,12 +72,6 @@ CONFIG_USB_STORAGE=y >> CONFIG_USB_UAS=y >> CONFIG_MMC=y >> CONFIG_MMC_SPI=y >> -CONFIG_VIRTIO_PCI=y >> -CONFIG_VIRTIO_BALLOON=y >> -CONFIG_VIRTIO_INPUT=y >> -CONFIG_VIRTIO_MMIO=y >> -CONFIG_RPMSG_CHAR=y >> -CONFIG_RPMSG_VIRTIO=y >> CONFIG_EXT4_FS=y >> CONFIG_EXT4_FS_POSIX_ACL=y >> CONFIG_AUTOFS4_FS=y >> @@ -98,6 +86,5 @@ CONFIG_NFS_V4_2=y >> CONFIG_ROOT_NFS=y >> CONFIG_9P_FS=y >> CONFIG_CRYPTO_USER_API_HASH=y >> -CONFIG_CRYPTO_DEV_VIRTIO=y >> CONFIG_PRINTK_TIME=y >> # CONFIG_RCU_TRACE is not set >> diff --git a/arch/riscv/configs/rv32_defconfig >> b/arch/riscv/configs/rv32_defconfig >> index 87ee6e62b64b..bbcf14fd6f40 100644 >> --- a/arch/riscv/configs/rv32_defconfig >> +++ b/arch/riscv/configs/rv32_defconfig >> @@ -14,6 +14,7 @@ CONFIG_CHECKPOINT_RESTORE=y >> CONFIG_BLK_DEV_INITRD=y >> CONFIG_EXPERT=y >> CONFIG_BPF_SYSCALL=y >> +CONFIG_SOC_VIRT=y >> CONFIG_ARCH_RV32I=y >> CONFIG_SMP=y >> CONFIG_MODULES=y >> @@ -30,7 +31,6 @@ CONFIG_IP_PNP_BOOTP=y >> CONFIG_IP_PNP_RARP=y >> CONFIG_NETLINK_DIAG=y >> CONFIG_NET_9P=y >> -CONFIG_NET_9P_VIRTIO=y >> CONFIG_PCI=y >> CONFIG_PCIEPORTBUS=y >> CONFIG_PCI_HOST_GENERIC=y >> @@ -38,15 +38,12 @@ CONFIG_PCIE_XILINX=y >> CONFIG_DEVTMPFS=y >> CONFIG_DEVTMPFS_MOUNT=y >> CONFIG_BLK_DEV_LOOP=y >> -CONFIG_VIRTIO_BLK=y >> CONFIG_BLK_DEV_SD=y >> CONFIG_BLK_DEV_SR=y >> -CONFIG_SCSI_VIRTIO=y >> CONFIG_ATA=y >> CONFIG_SATA_AHCI=y >> CONFIG_SATA_AHCI_PLATFORM=y >> CONFIG_NETDEVICES=y >> -CONFIG_VIRTIO_NET=y >> CONFIG_MACB=y >> CONFIG_E1000E=y >> CONFIG_R8169=y >> @@ -57,13 +54,10 @@ CONFIG_SERIAL_8250_CONSOLE=y >> CONFIG_SERIAL_OF_PLATFORM=y >> CONFIG_SERIAL_EARLYCON_RISCV_SBI=y >> CONFIG_HVC_RISCV_SBI=y >> -CONFIG_VIRTIO_CONSOLE=y >> CONFIG_HW_RANDOM=y >> -CONFIG_HW_RANDOM_VIRTIO=y >> # CONFIG_PTP_1588_CLOCK is not set >> CONFIG_DRM=y >> CONFIG_DRM_RADEON=y >> -CONFIG_DRM_VIRTIO_GPU=y >> CONFIG_FRAMEBUFFER_CONSOLE=y >> CONFIG_USB=y >> CONFIG_USB_XHCI_HCD=y >> @@ -74,13 +68,6 @@ CONFIG_USB_OHCI_HCD=y >> CONFIG_USB_OHCI_HCD_PLATFORM=y >> CONFIG_USB_STORAGE=y >> CONFIG_USB_UAS=y >> -CONFIG_VIRTIO_PCI=y >> -CONFIG_VIRTIO_BALLOON=y >> -CONFIG_VIRTIO_INPUT=y >> -CONFIG_VIRTIO_MMIO=y >> -CONFIG_RPMSG_CHAR=y >> -CONFIG_RPMSG_VIRTIO=y >> -CONFIG_SIFIVE_PLIC=y >> CONFIG_EXT4_FS=y >> CONFIG_EXT4_FS_POSIX_ACL=y >> CONFIG_AUTOFS4_FS=y >> @@ -95,6 +82,5 @@ CONFIG_NFS_V4_2=y >> CONFIG_ROOT_NFS=y >> CONFIG_9P_FS=y >> CONFIG_CRYPTO_USER_API_HASH=y >> -CONFIG_CRYPTO_DEV_VIRTIO=y >> CONFIG_PRINTK_TIME=y >> # CONFIG_RCU_TRACE is not set > > Otherwise, looks good. > > Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
|  |