[src/trunk]: src/sys/arch/evbarm/conf Use GENERIC instead.

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

details:   https://anonhg.NetBSD.org/src/rev/90ec2ca3eba3
branches:  trunk
changeset: 933257:90ec2ca3eba3
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat May 23 12:22:57 2020 +0000

description:
Use GENERIC instead.

diffstat:

 sys/arch/evbarm/conf/VIRT     |  82 -------------------------------------------
 sys/arch/evbarm/conf/std.virt |  36 ------------------
 2 files changed, 0 insertions(+), 118 deletions(-)

diffs (126 lines):

diff -r 20c2ad4fba33 -r 90ec2ca3eba3 sys/arch/evbarm/conf/VIRT
--- a/sys/arch/evbarm/conf/VIRT Sat May 23 11:59:03 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-#
-#      $NetBSD: VIRT,v 1.10 2020/04/18 11:00:38 skrll Exp $
-#
-#      QEMU ARM 'virt' virtual machine
-#
-
-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
-
-pseudo-device  openfirm        # /dev/openfirm
-
-#options       DIAGNOSTIC      # internal consistency checks
-#options       DEBUG
-#options       LOCKDEBUG
-#options       UVMHIST         # kernhist for uvm/pmap subsystems
-#options       VERBOSE_INIT_ARM # verbose bootstrapping messages
-#options       EARLYCONS=virt, CONSADDR=0x09000000
-
-makeoptions    DEBUG="-g"      # compile full symbol table
-makeoptions    COPY_SYMTAB=1
-
-config         netbsd          root on ? type ?
-
-# Device tree support
-armfdt0                at root
-simplebus*     at fdt? pass 0
-
-# CPUs
-cpus*          at fdt? pass 0
-cpu*           at fdt? pass 0
-
-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?
-
-# Timer
-gtmr*          at fdt? pass 1          # ARM Generic Timer
-armgtmr0       at gtmr?
-
-# Interrupt controller
-gic*           at fdt? pass 1          # GIC
-armgic0                at gic?
-
-# UART
-plcom*         at fdt?                 # ARM PL011 UART
-
-# RTC
-plrtc*         at fdt?                 # ARM PrimeCell RTC
-
-# GPIO
-plgpio*                at fdt?                 # ARM PrimeCell GPIO
-
-# 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 20c2ad4fba33 -r 90ec2ca3eba3 sys/arch/evbarm/conf/std.virt
--- a/sys/arch/evbarm/conf/std.virt     Sat May 23 11:59:03 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#       $NetBSD: std.virt,v 1.7 2018/10/18 09:01:54 skrll Exp $
-#
-# standard NetBSD/evbarm for VIRT options
-
-machine                 evbarm arm
-include                "arch/evbarm/conf/std.evbarm"
-
-# Pull in VIRT config definitions
-include                "arch/evbarm/conf/files.virt"
-
-# Architecture opions
-options        ARM_HAS_VBAR
-options        ARM_GENERIC_TODR
-options        ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options        DRAM_BLOCKS=256
-options        FDT                             # Flattened Device Tree support
-options        FPU_VFP
-options        MODULAR
-options        MODULAR_DEFAULT_AUTOLOAD
-options        TPIDRPRW_IS_CURCPU
-options        __HAVE_CPU_COUNTER
-options        __HAVE_CPU_UAREA_ALLOC_IDLELWP
-options        __HAVE_FAST_SOFTINTS            # should be in types.h
-options        __HAVE_GENERIC_START
-#options       __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-
-makeoptions    BOARDMKFRAG="${THISARM}/conf/mk.virt"
-makeoptions    BOARDTYPE="virt"
-makeoptions    CPUFLAGS="-march=armv7-a -mfpu=neon"
-makeoptions    KERNEL_BASE_PHYS="0x41000000"
-makeoptions    KERNEL_BASE_VIRT="0x81000000"
-
-# initrd support
-options        MEMORY_DISK_HOOKS
-options        MEMORY_DISK_DYNAMIC
-pseudo-device  md