[src/trunk]: src/sys/arch/evbmips/conf I forgot to add the needed conf files ...

[reinoud <reinoud%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b012a153de8d
branches:  trunk
changeset: 959511:b012a153de8d
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Tue Feb 16 10:58:32 2021 +0000

description:
I forgot to add the needed conf files for the mipssim virtio addition

diffstat:

 sys/arch/evbmips/conf/MIPSSIM       |  35 +++++++++++++++++++++++++++++++----
 sys/arch/evbmips/conf/files.mipssim |  13 ++++++++++++-
 2 files changed, 43 insertions(+), 5 deletions(-)

diffs (98 lines):

diff -r d2d63abaee50 -r b012a153de8d sys/arch/evbmips/conf/MIPSSIM
--- a/sys/arch/evbmips/conf/MIPSSIM     Tue Feb 16 10:22:52 2021 +0000
+++ b/sys/arch/evbmips/conf/MIPSSIM     Tue Feb 16 10:58:32 2021 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: MIPSSIM,v 1.2 2021/02/08 00:47:53 simonb Exp $
+# $NetBSD: MIPSSIM,v 1.3 2021/02/16 10:58:32 reinoud Exp $
 #
 # Kernel config for the QEMU MIPS "mipssim" simulator
+#
+# The QEMU virtio support is experimental and subject to change
+# and will likely be removed when qemu gains a MIPS "virt" target.
+#
 
 include        "arch/evbmips/conf/std.mipssim"
 
-#ident                 "GENERIC-$Revision: 1.2 $"
+#ident                 "GENERIC-$Revision: 1.3 $"
 
 maxusers       32
 
@@ -63,8 +67,8 @@
 #options       NFSSERVER       # Sun NFS-compatible filesystem server
 #options       QUOTA           # legacy UFS quotas
 #options       QUOTA2          # new, in-filesystem UFS quotas
-#options       DISKLABEL_EI    # disklabel Endian Independent support
-#options       FFS_EI          # FFS Endian Independent support
+options        DISKLABEL_EI    # disklabel Endian Independent support
+options        FFS_EI          # FFS Endian Independent support
 #options       WAPBL           # File system journaling support
 #options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
                                # immutable) behave as system flags.
@@ -105,6 +109,29 @@
 # mipsnet*     at mainbus?
 # options      MIPSSIM_ETH_MACADDR="ba:bb:1e:01:23:45"
 
+
+# Virtio devices
+virtio*                at mainbus?             # Virtio PCI device
+#viomb*                at virtio?              # Virtio memory balloon device
+ld*            at virtio?              # Virtio disk device
+vioif*         at virtio?              # Virtio network device
+viornd*                at virtio?              # Virtio entropy device
+vioscsi*       at virtio?              # Virtio SCSI device
+#vio9p*                at virtio?              # Virtio 9P device
+
+# SCSI bus support
+scsibus* at scsi?
+
+# SCSI devices
+sd*    at scsibus? target ? lun ?      # SCSI disk drives
+#st*   at scsibus? target ? lun ?      # SCSI tape drives
+cd*    at scsibus? target ? lun ?      # SCSI CD-ROM drives
+#ch*   at scsibus? target ? lun ?      # SCSI autochangers
+#ses*  at scsibus? target ? lun ?      # SCSI Enclosure Services devices
+#ss*   at scsibus? target ? lun ?      # SCSI scanners
+#uk*   at scsibus? target ? lun ?      # SCSI unknown
+
+
 # Network pseudo-devices
 pseudo-device  bpfilter                        # Berkeley packet filter
 #pseudo-device         carp                            # Common Address Redundancy Protocol
diff -r d2d63abaee50 -r b012a153de8d sys/arch/evbmips/conf/files.mipssim
--- a/sys/arch/evbmips/conf/files.mipssim       Tue Feb 16 10:22:52 2021 +0000
+++ b/sys/arch/evbmips/conf/files.mipssim       Tue Feb 16 10:58:32 2021 +0000
@@ -1,15 +1,19 @@
-# $NetBSD: files.mipssim,v 1.1 2021/01/27 05:24:16 simonb Exp $
+# $NetBSD: files.mipssim,v 1.2 2021/02/16 10:58:33 reinoud Exp $
 
 file   arch/evbmips/mipssim/autoconf.c
 file   arch/evbmips/mipssim/machdep.c
 file   arch/evbmips/mipssim/mipssim_intr.c
+file   arch/evbmips/mipssim/mipssim_dma.c
 file   arch/evbmips/mipssim/mipssim_bus_io.c
 
 file   arch/evbmips/evbmips/interrupt.c
 
+file   arch/mips/mips/bus_dma.c
 file   arch/mips/mips/mips3_clock.c
 file   arch/mips/mips/mips3_clockintr.c
 
+file   kern/subr_disk_mbr.c                    disk
+
 # System bus
 device mainbus {}
 attach mainbus at root
@@ -27,5 +31,12 @@
 file   arch/evbmips/mipssim/if_mipsnet.c       mipsnet
 defparam opt_mipsnet.h                         MIPSSIM_ETH_MACADDR
 
+attach virtio at mainbus with virtio_mainbus:  virtio_mmio
+file   arch/evbmips/mipssim/virtio_mainbus.c   virtio_mainbus
+
 # Memory Disk
 file   dev/md_root.c                           memory_disk_hooks
+
+# SCSI support
+include "dev/scsipi/files.scsipi"
+