[src/trunk]: src/sys/arch/evbarm/conf 'virt' platform adjustments:

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

details:   https://anonhg.NetBSD.org/src/rev/3875c84f8af1
branches:  trunk
changeset: 833204:3875c84f8af1
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Jun 15 15:00:14 2018 +0000

description:
'virt' platform adjustments:
 - support broader CPU model range
 - move kernel physical and virtual base to avoid bootloader,
   and keep KVA at or above 2GiB
 - add relevant drivers

diffstat:

 sys/arch/evbarm/conf/VIRT     |  26 +++++++++++++++++++++++++-
 sys/arch/evbarm/conf/std.virt |   8 ++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diffs (85 lines):

diff -r 1f1229eef6d4 -r 3875c84f8af1 sys/arch/evbarm/conf/VIRT
--- a/sys/arch/evbarm/conf/VIRT Fri Jun 15 14:37:35 2018 +0000
+++ b/sys/arch/evbarm/conf/VIRT Fri Jun 15 15:00:14 2018 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: VIRT,v 1.1 2018/06/14 10:56:39 jmcneill Exp $
+#      $NetBSD: VIRT,v 1.2 2018/06/15 15:00:14 jakllsch Exp $
 #
 #      QEMU ARM 'virt' virtual machine
 #
@@ -7,7 +7,9 @@
 include        "arch/evbarm/conf/std.virt"
 include        "arch/evbarm/conf/GENERIC.common"
 
+options        CPU_CORTEXA7
 options        CPU_CORTEXA15
+options        CPU_CORTEXA17
 options        SOC_VIRT
 options        MULTIPROCESSOR
 
@@ -19,6 +21,7 @@
 #options       PMAP_DEBUG      # Enable pmap_debug_level code
 #options       IPKDB           # remote kernel debugging
 #options       VERBOSE_INIT_ARM # verbose bootstrapping messages
+#options       CONSADDR=0x09000000
 
 makeoptions    DEBUG="-g"      # compile full symbol table
 makeoptions    COPY_SYMTAB=1
@@ -35,6 +38,8 @@
 
 fclock*                at fdt? pass 4
 fregulator*    at fdt? pass 4
+gpiokeys*      at fdt?
+wskbd*         at gpiokeys? console ? mux 1
 
 # Power state coordination interface
 psci*          at fdt?
@@ -53,4 +58,23 @@
 # RTC
 plrtc*         at fdt?                 # ARM PrimeCell RTC
 
+# Virtio devices
+virtio*        at fdt?                         # Virtio MMIO device
+# the balloon driver can not work on machines with non-4k pages
+#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
+
+# SCSI
+scsibus* at scsi?
+sd*    at scsibus? target ? lun ?      # SCSI disks
+st*    at scsibus? target ? lun ?      # SCSI tapes
+cd*    at scsibus? target ? lun ?      # SCSI CD-ROMs
+ch*    at scsibus? target ? lun ?      # SCSI changer devices
+ss*    at scsibus? target ? lun ?      # SCSI scanners
+ses*   at scsibus? target ? lun ?      # SCSI SES/SAF-TE devices
+uk*    at scsibus? target ? lun ?      # unknown SCSI
+
 cinclude "arch/evbarm/conf/VIRT.local"
diff -r 1f1229eef6d4 -r 3875c84f8af1 sys/arch/evbarm/conf/std.virt
--- a/sys/arch/evbarm/conf/std.virt     Fri Jun 15 14:37:35 2018 +0000
+++ b/sys/arch/evbarm/conf/std.virt     Fri Jun 15 15:00:14 2018 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: std.virt,v 1.1 2018/06/14 10:56:39 jmcneill Exp $
+#       $NetBSD: std.virt,v 1.2 2018/06/15 15:00:14 jakllsch Exp $
 #
 # standard NetBSD/evbarm for VIRT options
 
@@ -21,11 +21,11 @@
 options        KERNEL_BASE_EXT=0x80000000
 options        FPU_VFP
 
-makeoptions     KERNEL_BASE_PHYS="0x40000000"
-makeoptions     KERNEL_BASE_VIRT="0x40000000"
+makeoptions     KERNEL_BASE_PHYS="0x41000000"
+makeoptions     KERNEL_BASE_VIRT="0x81000000"
 makeoptions     BOARDTYPE="virt"
 makeoptions     BOARDMKFRAG="${THISARM}/conf/mk.virt"
-makeoptions     CPUFLAGS="-mcpu=cortex-a15 -mfpu=neon"
+makeoptions     CPUFLAGS="-mcpu=armv7-a -mfpu=neon"
 
 options         ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
 options         ARM_GENERIC_TODR