[src/trunk]: src/sys/arch mostly converted sbmips -> evbmips. the SBMIPS ker...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch mostly converted sbmips -> evbmips. the SBMIPS ker...
From: mrg <mrg%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 08:30:46 +0000
details:   https://anonhg.NetBSD.org/src/rev/2eb464f76afc
branches:  trunk
changeset: 825592:2eb464f76afc
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 24 09:56:45 2017 +0000

description:
mostly converted sbmips -> evbmips.  the SBMIPS kernel builds fully
sans disksubr.c.  intr.h does not need any additional fixes now,
only disklabel.h.

also test-built some other mips kernels.

diffstat:

 sys/arch/evbmips/conf/SBMIPS           |   6 +++---
 sys/arch/evbmips/conf/SBMIPS.MP        |   3 ++-
 sys/arch/evbmips/conf/SBMIPS64         |   3 ++-
 sys/arch/evbmips/conf/SBMIPS64.MP      |   3 ++-
 sys/arch/evbmips/conf/files.sbmips     |  25 +++++++++++--------------
 sys/arch/evbmips/conf/std.sbmips       |   5 +++--
 sys/arch/evbmips/include/param.h       |   4 ++--
 sys/arch/evbmips/include/pci_machdep.h |   9 ++++++++-
 sys/arch/evbmips/sbmips/cpu.c          |   7 ++++---
 sys/arch/evbmips/sbmips/machdep.c      |  13 +++++++------
 sys/arch/evbmips/sbmips/rtc.c          |   8 ++++----
 sys/arch/evbmips/sbmips/sb1250_icu.c   |   8 ++++----
 sys/arch/evbmips/sbmips/systemsw.c     |   6 +++---
 sys/arch/evbmips/sbmips/zbbus.c        |   6 ++++--
 sys/arch/mips/conf/files.sibyte        |   3 ++-
 sys/arch/mips/include/pmap.h           |  14 +++++++++++++-
 sys/arch/mips/sibyte/dev/sbbuswatch.c  |   4 +++-
 sys/arch/mips/sibyte/dev/sbmac.c       |   6 ++++--
 sys/arch/mips/sibyte/dev/sbscn.c       |   6 ++++--
 sys/arch/mips/sibyte/dev/sbsmbus.c     |   6 +++---
 sys/arch/mips/sibyte/dev/sbtimer.c     |   6 ++++--
 sys/arch/mips/sibyte/dev/sbwdog.c      |   6 ++++--
 sys/arch/mips/sibyte/pci/sbbrz_pci.c   |   6 ++++--
 23 files changed, 100 insertions(+), 63 deletions(-)

diffs (truncated from 557 to 300 lines):

diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/conf/SBMIPS
--- a/sys/arch/evbmips/conf/SBMIPS      Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/conf/SBMIPS      Mon Jul 24 09:56:45 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: SBMIPS,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $
+# $NetBSD: SBMIPS,v 1.2 2017/07/24 09:56:45 mrg Exp $
 
-include        "arch/sbmips/conf/std.sbmips"
+include        "arch/evbmips/conf/std.sbmips"
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1.1.1 $"
+#ident                 "GENERIC-$Revision: 1.2 $"
 
 #options       LOCKDEBUG       # XXX XXX XXX XXX
 #options       DEBUG           # extra kernel debugging support
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/conf/SBMIPS.MP
--- a/sys/arch/evbmips/conf/SBMIPS.MP   Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/conf/SBMIPS.MP   Mon Jul 24 09:56:45 2017 +0000
@@ -1,5 +1,6 @@
+# $NetBSD: SBMIPS.MP,v 1.2 2017/07/24 09:56:45 mrg Exp $
 
-include "arch/sbmips/conf/GENERIC"
+include "arch/evbmips/conf/SBMIPS"
 
 options        MULTIPROCESSOR
 options        LOCKDEBUG
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/conf/SBMIPS64
--- a/sys/arch/evbmips/conf/SBMIPS64    Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/conf/SBMIPS64    Mon Jul 24 09:56:45 2017 +0000
@@ -1,5 +1,6 @@
+# $NetBSD: SBMIPS64,v 1.2 2017/07/24 09:56:45 mrg Exp $
 
-include "arch/sbmips/conf/GENERIC"
+include "arch/evbmips/conf/SBMIPS"
 
 makeoptions    LP64="yes"
 options        EXEC_ELF64
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/conf/SBMIPS64.MP
--- a/sys/arch/evbmips/conf/SBMIPS64.MP Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/conf/SBMIPS64.MP Mon Jul 24 09:56:45 2017 +0000
@@ -1,5 +1,6 @@
+# $NetBSD: SBMIPS64.MP,v 1.2 2017/07/24 09:56:45 mrg Exp $
 
-include "arch/sbmips/conf/GENERIC64"
+include "arch/evbmips/conf/SBMIPS64"
 
 options        MULTIPROCESSOR
 options        LOCKDEBUG
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/conf/files.sbmips
--- a/sys/arch/evbmips/conf/files.sbmips        Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/conf/files.sbmips        Mon Jul 24 09:56:45 2017 +0000
@@ -1,17 +1,16 @@
-# $NetBSD: files.sbmips,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $
+# $NetBSD: files.sbmips,v 1.2 2017/07/24 09:56:45 mrg Exp $
 
 maxpartitions 8
 
-maxusers 1 8 64
+#maxusers 1 8 64
 
-file arch/sbmips/sbmips/autoconf.c
-file arch/sbmips/sbmips/machdep.c
-file arch/sbmips/sbmips/console.c
-file arch/sbmips/sbmips/disksubr.c
-file arch/sbmips/sbmips/systemsw.c
-file dev/cons.c
+file arch/evbmips/sbmips/autoconf.c
+file arch/evbmips/sbmips/machdep.c
+file arch/evbmips/sbmips/console.c
+file arch/evbmips/sbmips/disksubr.c
+file arch/evbmips/sbmips/systemsw.c
 
-file arch/sbmips/sbmips/sb1250_icu.c
+file arch/evbmips/sbmips/sb1250_icu.c
 
 file arch/mips/cfe/cfe_api.c
 file arch/mips/mips/mips3_clock.c
@@ -51,7 +50,7 @@
 
 # PCI Bus support
 # include "dev/pci/files.pci" XXX SEE ABOVE
-#file  arch/sbmips/dev/pci/pci_machdep.c       pci
+#file  arch/evbmips/sbmips/pci_machdep.c       pci
 # XXXCGD macdep pci files
 
 # XXXX pcic here because it needs to be late.  The catch: pcic needs
@@ -103,11 +102,9 @@
 # Ze Big Bus: main system bus
 device zbbus {[busid = -1]}
 attach zbbus at root
-file   arch/sbmips/sbmips/zbbus.c              zbbus
+file   arch/evbmips/sbmips/zbbus.c             zbbus
 
 # CPUs
 device cpu
 attach cpu at zbbus
-file   arch/sbmips/sbmips/cpu.c                cpu
-
-include "arch/evbmips/conf/majors.evbmips"
+file   arch/evbmips/sbmips/cpu.c               cpu
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/conf/std.sbmips
--- a/sys/arch/evbmips/conf/std.sbmips  Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/conf/std.sbmips  Mon Jul 24 09:56:45 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: std.sbmips,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $
+# $NetBSD: std.sbmips,v 1.2 2017/07/24 09:56:45 mrg Exp $
 
-machine sbmips mips
+machine evbmips mips
 include                "conf/std"      # MI standard options
 
 options        MIPS64
@@ -13,4 +13,5 @@
 makeoptions    AFLAGS+="-mips64 -mtune=sb1"
 makeoptions    DEFTEXTADDR="0x80001000"
 
+include        "arch/evbmips/conf/files.sbmips"
 include        "arch/mips/conf/files.sibyte"
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/include/param.h
--- a/sys/arch/evbmips/include/param.h  Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/include/param.h  Mon Jul 24 09:56:45 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.9 2011/03/18 16:30:01 tsutsui Exp $        */
+/*     $NetBSD: param.h,v 1.10 2017/07/24 09:56:45 mrg Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -55,7 +55,7 @@
 #ifndef _LOCORE
 
 void   delay(int n);
-#define        DELAY           delay
+#define        DELAY(x)                delay(x)
 
 #include <machine/intr.h>
 
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/include/pci_machdep.h
--- a/sys/arch/evbmips/include/pci_machdep.h    Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/include/pci_machdep.h    Mon Jul 24 09:56:45 2017 +0000
@@ -1,6 +1,13 @@
-/* $NetBSD: pci_machdep.h,v 1.2 2002/03/18 10:10:15 simonb Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.3 2017/07/24 09:56:45 mrg Exp $ */
 
+#ifdef _KERNEL_OPT
+#include "opt_cputype.h"
+#endif
+
+/* SB1 PCI isn't finished */
+#ifndef MIPS64_SB1
 /* Before including <mips/pci_machdep.h> */
 #define        __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
+#endif
 
 #include <mips/pci_machdep.h>
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/sbmips/cpu.c
--- a/sys/arch/evbmips/sbmips/cpu.c     Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/sbmips/cpu.c     Mon Jul 24 09:56:45 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.2 2017/07/24 09:56:45 mrg Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.2 2017/07/24 09:56:45 mrg Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -46,7 +46,8 @@
 #include <mips/locore.h>
 #include <mips/cache.h>
 
-#include <sbmips/cpuvar.h>
+#include <evbmips/sbmips/cpuvar.h>
+#include <evbmips/sbmips/systemsw.h>
 
 #include <mips/sibyte/include/zbbusvar.h>
 #include <mips/sibyte/include/sb1250_regs.h>
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/sbmips/machdep.c
--- a/sys/arch/evbmips/sbmips/machdep.c Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/sbmips/machdep.c Mon Jul 24 09:56:45 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.2 2017/07/24 09:56:45 mrg Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2017/07/24 09:56:45 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
@@ -93,13 +93,14 @@
 
 #include <mips/cfe/cfe_api.h>
 
-#include <sbmips/autoconf.h>
-#include <sbmips/swarm.h>
+#include <evbmips/sbmips/autoconf.h>
+#include <evbmips/sbmips/swarm.h>
+#include <evbmips/sbmips/systemsw.h>
 
 #if 0 /* XXXCGD */
-#include <sbmips/nvram.h>
+#include <evbmips/sbmips/nvram.h>
 #endif /* XXXCGD */
-#include <sbmips/leds.h>
+#include <evbmips/sbmips/leds.h>
 
 #include <mips/sibyte/dev/sbbuswatchvar.h>
 
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/sbmips/rtc.c
--- a/sys/arch/evbmips/sbmips/rtc.c     Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/sbmips/rtc.c     Mon Jul 24 09:56:45 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
+/* $NetBSD: rtc.c,v 1.2 2017/07/24 09:56:45 mrg Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.2 2017/07/24 09:56:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -46,8 +46,8 @@
 
 #include <dev/clock_subr.h>
 
-#include <sbmips/swarm.h>
-#include <sbmips/systemsw.h>
+#include <evbmips/sbmips/swarm.h>
+#include <evbmips/sbmips/systemsw.h>
 
 #include <mips/locore.h>
 #include <mips/sibyte/dev/sbsmbusvar.h>
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/sbmips/sb1250_icu.c
--- a/sys/arch/evbmips/sbmips/sb1250_icu.c      Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/sbmips/sb1250_icu.c      Mon Jul 24 09:56:45 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.2 2017/07/24 09:56:45 mrg Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.2 2017/07/24 09:56:45 mrg Exp $");
 
 #define        __INTR_PRIVATE
 
@@ -49,8 +49,8 @@
 
 #include <mips/locore.h>
 
-#include <sbmips/cpuvar.h>
-#include <sbmips/systemsw.h>
+#include <evbmips/sbmips/cpuvar.h>
+#include <evbmips/sbmips/systemsw.h>
 
 #include <mips/sibyte/include/sb1250_regs.h>
 #include <mips/sibyte/include/sb1250_int.h>
diff -r f0e7512ca8c3 -r 2eb464f76afc sys/arch/evbmips/sbmips/systemsw.c
--- a/sys/arch/evbmips/sbmips/systemsw.c        Mon Jul 24 09:21:50 2017 +0000
+++ b/sys/arch/evbmips/sbmips/systemsw.c        Mon Jul 24 09:56:45 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: systemsw.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
+/* $NetBSD: systemsw.c,v 1.2 2017/07/24 09:56:45 mrg Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: systemsw.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: systemsw.c,v 1.2 2017/07/24 09:56:45 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -44,7 +44,7 @@
 #include <mips/locore.h>
 #include <mips/mips3_clock.h>
Prev by Date: [src/trunk]: src/sys/arch/evbmips import most of the sbmips port into evbmips...
Next by Date: [src/trunk]: src/sys/arch/evbmips sbmips->evbmips merge: import all the all ...
Previous by Thread: [src/trunk]: src/sys/arch/evbmips import most of the sbmips port into evbmips...
Next by Thread: [src/trunk]: src/sys/arch/evbmips sbmips->evbmips merge: import all the all ...
Indexes:
Home | Main Index | Thread Index | Old Index