Merge majors.{arm32,aarch64} into single file (Re: CVS commit: src/sys/arch/evbarm/conf)

[Rin Okuyama <rokuyama%rk.phys.keio.ac.jp@localhost>]

Oops, I forgot to CC to source-changes-d@.

-------- Forwarded Message --------
Subject: Merge majors.{arm32,aarch64} into single file (Re: CVS commit: src/sys/arch/evbarm/conf)
To: matthew green <mrg%eterna.com.au@localhost>
Cc: Jared McNeill <jmcneill%invisible.ca@localhost>, Nick Hudson <nick.hudson%gmx.co.uk@localhost>, Ryo Shimizu <ryo%nerv.org@localhost>
From: Rin Okuyama <rokuyama%rk.phys.keio.ac.jp@localhost>
Date: Sun, 19 Aug 2018 08:57:53 +0900

On 2018/08/19 3:48, matthew green wrote:
> can't we make arm and arm64 use the identical majors file?
>
> please!

Diff between majors.arm32 and aarch64 reads

====
--- arm/conf/majors.arm32       2015-04-24 08:22:51.000000000 +0900
+++ aarch64/conf/majors.aarch64 2015-04-24 08:22:51.000000000 +0900
@@ -1,4 +1,4 @@
-#      $NetBSD: majors.arm32,v 1.37 2015/04/23 23:22:51 pgoyette Exp $
+# $NetBSD: majors.aarch64,v 1.2 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for arm32
 #
@@ -91,7 +91,6 @@
 device-major   irframe         char 95                 irframedrv
 device-major   cir             char 96                 cir
 device-major   radio           char 97                 radio
-device-major   ctcom           char 98                 ctcom
 device-major   kttcp           char 99                 kttcp
 device-major   ixpcom          char 100                ixpcom
 device-major   sysmon          char 101                sysmon
@@ -105,8 +104,7 @@
 device-major   tslcd           char 108                tslcd
 device-major   twe             char 109                twe
 device-major   nsmb            char 110                nsmb
-device-major   vchiq           char 111                vchiq
-device-major   zynquart        char 112                zynquart
+#device-major  vchiq           char 111                vchiq

 # Majors up to 143 are reserved for machine-dependent drivers.
 # New machine-independent driver majors are assigned in
====

- ctcom was added by matt@ back in 2014, but no one uses it now
- vchiq is a device of RPI, not still supported in aarch64 mode
- zynquart is a device of Xilinx Zynq boards, whose 64bit models are
  not currently supported

It seems harmless to add these devices in majors.aarch64. Therefore,
I propose:

(1) rename majors.arm32 to majors.arm
(2) remove majors.aarch64
(3) make everyone include majors.arm

I will commit if there's no objection.

rin