[PATCH 0/2] MIPS: set virtio and other options in malta defconfigs

[PATCH 0/2] MIPS: set virtio and other options in malta defconfigs

[Denis Orlov]

The issues with VIRTIO_PCI on MIPS seems to have been fixes, so enable
this option. And, while at it, also enable a few more for which there is
no reason not to have them enabled.

Denis Orlov (2):
  virtio: remove VIRTIO_PCI dependance on MMU for MIPS
  MIPS: enable more options in malta defconfigs

 arch/mips/configs/qemu-malta64el_defconfig | 10 +++++++++-
 arch/mips/configs/qemu-malta_defconfig     | 10 +++++++++-
 drivers/virtio/Kconfig                     |  1 -
 3 files changed, 18 insertions(+), 3 deletions(-)

-- 
2.41.0

[PATCH 1/2] virtio: remove VIRTIO_PCI dependance on MMU for MIPS

[Denis Orlov]

The issues that broke the usage of VIRTIO_PCI on MIPS when we are
running uncached (i.e. with CONFIG_MMU=n) seem to have been fixed.
As such, allow this option to be set for those configurations.

Signed-off-by: Denis Orlov <denorl2009@gmail.com>
---
 drivers/virtio/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index 91a89d3e1b..ecf66987b3 100644
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -28,7 +28,6 @@ config VIRTIO_MMIO
 config VIRTIO_PCI
 	tristate "PCI driver for virtio devices"
 	depends on PCI && HAS_DMA
-	depends on MMU && MIPS || !MIPS
 	select VIRTIO
 	help
 	  This driver provides support for virtio based paravirtual device
-- 
2.41.0

[PATCH 2/2] MIPS: enable more options in malta defconfigs

[Denis Orlov]

This mainly enables virtio stuff, but also turns on EXT4 and GPT
support. The latter two simplify things somewhat, allowing to mount
appropriate images, and are enabled in generic defconfigs for other
archs.

Signed-off-by: Denis Orlov <denorl2009@gmail.com>
---
 arch/mips/configs/qemu-malta64el_defconfig | 10 +++++++++-
 arch/mips/configs/qemu-malta_defconfig     | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/arch/mips/configs/qemu-malta64el_defconfig b/arch/mips/configs/qemu-malta64el_defconfig
index 5fb090a646..6091e6d030 100644
--- a/arch/mips/configs/qemu-malta64el_defconfig
+++ b/arch/mips/configs/qemu-malta64el_defconfig
@@ -13,7 +13,7 @@ CONFIG_AUTO_COMPLETE=y
 CONFIG_MENU=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_CONSOLE_ALLOW_COLOR=y
-CONFIG_PARTITION=y
+CONFIG_PARTITION_DISK_EFI=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_CMD_DMESG=y
 CONFIG_LONGHELP=y
@@ -62,6 +62,7 @@ CONFIG_NET_NFS=y
 CONFIG_NET_NETCONSOLE=y
 CONFIG_OFDEVICE=y
 CONFIG_OF_BAREBOX_DRIVERS=y
+CONFIG_VIRTIO_CONSOLE=y
 CONFIG_DRIVER_NET_RTL8139=y
 # CONFIG_SPI is not set
 CONFIG_I2C=y
@@ -72,15 +73,22 @@ CONFIG_DRIVER_CFI=y
 # CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set
 # CONFIG_DRIVER_CFI_BANK_WIDTH_2 is not set
 CONFIG_CFI_BUFFER_WRITE=y
+CONFIG_DISK=y
+CONFIG_VIRTIO_BLK=y
 CONFIG_VIDEO=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_DRIVER_VIDEO_BOCHS_PCI=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_HWRNG=y
+CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_GPIO_MALTA_FPGA_I2C=y
 CONFIG_PCI=y
 CONFIG_PCI_DEBUG=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_POWER_RESET_SYSCON=y
+CONFIG_VIRTIO_PCI=y
 CONFIG_FS_CRAMFS=y
+CONFIG_FS_EXT4=y
 CONFIG_FS_TFTP=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
diff --git a/arch/mips/configs/qemu-malta_defconfig b/arch/mips/configs/qemu-malta_defconfig
index ab3abb7a2a..6cbc4efa86 100644
--- a/arch/mips/configs/qemu-malta_defconfig
+++ b/arch/mips/configs/qemu-malta_defconfig
@@ -10,7 +10,7 @@ CONFIG_AUTO_COMPLETE=y
 CONFIG_MENU=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_CONSOLE_ALLOW_COLOR=y
-CONFIG_PARTITION=y
+CONFIG_PARTITION_DISK_EFI=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_CMD_DMESG=y
 CONFIG_LONGHELP=y
@@ -59,6 +59,7 @@ CONFIG_NET_NFS=y
 CONFIG_NET_NETCONSOLE=y
 CONFIG_OFDEVICE=y
 CONFIG_OF_BAREBOX_DRIVERS=y
+CONFIG_VIRTIO_CONSOLE=y
 CONFIG_DRIVER_NET_RTL8139=y
 # CONFIG_SPI is not set
 CONFIG_I2C=y
@@ -69,15 +70,22 @@ CONFIG_DRIVER_CFI=y
 # CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set
 # CONFIG_DRIVER_CFI_BANK_WIDTH_2 is not set
 CONFIG_CFI_BUFFER_WRITE=y
+CONFIG_DISK=y
+CONFIG_VIRTIO_BLK=y
 CONFIG_VIDEO=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_DRIVER_VIDEO_BOCHS_PCI=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_HWRNG=y
+CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_GPIO_MALTA_FPGA_I2C=y
 CONFIG_PCI=y
 CONFIG_PCI_DEBUG=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_POWER_RESET_SYSCON=y
+CONFIG_VIRTIO_PCI=y
 CONFIG_FS_CRAMFS=y
+CONFIG_FS_EXT4=y
 CONFIG_FS_TFTP=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
-- 
2.41.0

Re: [PATCH 0/2] MIPS: set virtio and other options in malta defconfigs

[Sascha Hauer]

On Sat, Jun 10, 2023 at 11:36:27AM +0300, Denis Orlov wrote:
> The issues with VIRTIO_PCI on MIPS seems to have been fixes, so enable
> this option. And, while at it, also enable a few more for which there is
> no reason not to have them enabled.
> 
> Denis Orlov (2):
>   virtio: remove VIRTIO_PCI dependance on MMU for MIPS
>   MIPS: enable more options in malta defconfigs

Applied, thanks

Sascha

> 
>  arch/mips/configs/qemu-malta64el_defconfig | 10 +++++++++-
>  arch/mips/configs/qemu-malta_defconfig     | 10 +++++++++-
>  drivers/virtio/Kconfig                     |  1 -
>  3 files changed, 18 insertions(+), 3 deletions(-)
> 
> -- 
> 2.41.0
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |