Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Switch evbppc/ibm4xx to generic evbppc (same as oea) kernel ...



details:   https://anonhg.NetBSD.org/src/rev/67b1bd5a7a5e
branches:  trunk
changeset: 984986:67b1bd5a7a5e
user:      rin <rin%NetBSD.org@localhost>
date:      Tue Aug 03 09:25:43 2021 +0000

description:
Switch evbppc/ibm4xx to generic evbppc (same as oea) kernel modules.

I've confirmed that kernels similar to amd64/conf/MODULAR work fine
both on 403 and 405.

XXX
Unfortunately, we cannot immediately switch evbppc/booke to generic
kernel modules yet; it has its own intr.h implementation.

diffstat:

 doc/CHANGES                                                   |   3 +-
 sys/arch/evbppc/dht/machdep.c                                 |   7 +---
 sys/arch/evbppc/evbppc/evbppc_machdep.c                       |   9 +----
 sys/arch/evbppc/explora/machdep.c                             |   9 +----
 sys/arch/evbppc/include/cpu.h                                 |   5 +-
 sys/arch/evbppc/obs405/obs200_machdep.c                       |   9 +----
 sys/arch/evbppc/obs405/obs266_machdep.c                       |   9 +----
 sys/arch/evbppc/obs405/obs600_machdep.c                       |   9 +----
 sys/arch/evbppc/virtex/machdep.c                              |   9 +----
 sys/arch/evbppc/walnut/machdep.c                              |   9 +----
 sys/modules/arch/archdirs.mk                                  |   4 +-
 sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile              |   5 ---
 sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk |  17 -----------
 13 files changed, 22 insertions(+), 82 deletions(-)

diffs (truncated from 315 to 300 lines):

diff -r ed62cb21de65 -r 67b1bd5a7a5e doc/CHANGES
--- a/doc/CHANGES       Tue Aug 03 07:58:50 2021 +0000
+++ b/doc/CHANGES       Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:                   <$Revision: 1.2816 $>
+# LIST OF CHANGES FROM LAST RELEASE:                   <$Revision: 1.2817 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -389,3 +389,4 @@
                [tsutsui 20210709]
        kernel: Tie the maximum file lock per unprivilegied uid to 
                kern.maxfiles [manu 20210727]
+       evbppc: Switch ibm4xx to generic evbppc kernel modules. [rin 20210803]
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/dht/machdep.c
--- a/sys/arch/evbppc/dht/machdep.c     Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/dht/machdep.c     Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.1 2021/04/02 07:00:33 rin Exp $  */
+/*     $NetBSD: machdep.c,v 1.2 2021/08/03 09:25:43 rin Exp $  */
 
 /*
  * Taken from src/sys/arch/evbppc/walnut/machdep.c:
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1 2021/04/02 07:00:33 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2021/08/03 09:25:43 rin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pci.h"
@@ -188,9 +188,6 @@
        if (boothowto & RB_KDB)
                Debugger();
 #endif
-
-       /* Look for the ibm4xx modules in the right place */
-       module_machine = module_machine_ibm4xx;
 }
 
 void
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/evbppc/evbppc_machdep.c
--- a/sys/arch/evbppc/evbppc/evbppc_machdep.c   Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/evbppc/evbppc_machdep.c   Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $  */
+/*     $NetBSD: evbppc_machdep.c,v 1.15 2021/08/03 09:25:43 rin Exp $  */
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.14 2021/03/30 02:41:14 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.15 2021/08/03 09:25:43 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,11 +91,6 @@
 char machine[] = MACHINE;
 char machine_arch[] = MACHINE_ARCH;
 
-/*
- * ibm4xx kernels need to set module_machine to this for modules to work.
- */
-char module_machine_ibm4xx[] = "powerpc-ibm4xx";
-
 int fake_mapiodev = 1;
 
 /*
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/explora/machdep.c
--- a/sys/arch/evbppc/explora/machdep.c Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/explora/machdep.c Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.51 2021/03/30 03:20:13 rin Exp $ */
+/*     $NetBSD: machdep.c,v 1.52 2021/08/03 09:25:43 rin Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2021/03/30 03:20:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2021/08/03 09:25:43 rin Exp $");
 
 #include "opt_explora.h"
 
@@ -107,11 +107,6 @@
 
        ibm40x_memsize_init(size, startkernel);
        ibm4xx_init(startkernel, endkernel, pic_ext_intr);
-
-       /*
-        * Look for the ibm4xx modules in the right place.
-        */
-       module_machine = module_machine_ibm4xx;
 }
 
 void
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/include/cpu.h
--- a/sys/arch/evbppc/include/cpu.h     Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/include/cpu.h     Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.7 2011/06/20 06:35:40 matt Exp $     */
+/*     $NetBSD: cpu.h,v 1.8 2021/08/03 09:25:43 rin Exp $      */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -60,7 +60,6 @@
 
 #if defined(_KERNEL)
 extern char module_machine_booke[];
-extern char module_machine_ibm4xx[];
-#endif /* _KERNEL */
+#endif
 
 #endif /* _EVBPPC_CPU_H_ */
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/obs405/obs200_machdep.c
--- a/sys/arch/evbppc/obs405/obs200_machdep.c   Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/obs405/obs200_machdep.c   Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obs200_machdep.c,v 1.23 2021/03/30 04:53:13 rin Exp $  */
+/*     $NetBSD: obs200_machdep.c,v 1.24 2021/08/03 09:25:44 rin Exp $  */
 /*     Original: machdep.c,v 1.3 2005/01/17 17:24:09 shige Exp */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.23 2021/03/30 04:53:13 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.24 2021/08/03 09:25:44 rin Exp $");
 
 #include "opt_ddb.h"
 
@@ -156,11 +156,6 @@
        if (boothowto & RB_KDB)
                Debugger();
 #endif
-
-       /*
-        * Look for the ibm4xx modules in the right place.
-        */
-       module_machine = module_machine_ibm4xx;
 }
 
 void
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/obs405/obs266_machdep.c
--- a/sys/arch/evbppc/obs405/obs266_machdep.c   Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/obs405/obs266_machdep.c   Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obs266_machdep.c,v 1.26 2021/03/30 04:02:17 rin Exp $  */
+/*     $NetBSD: obs266_machdep.c,v 1.27 2021/08/03 09:25:44 rin Exp $  */
 /*     Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $    */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.26 2021/03/30 04:02:17 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.27 2021/08/03 09:25:44 rin Exp $");
 
 #include "opt_ddb.h"
 
@@ -147,11 +147,6 @@
        if (boothowto & RB_KDB)
                Debugger();
 #endif
-
-       /*
-        * Look for the ibm4xx modules in the right place.
-        */
-       module_machine = module_machine_ibm4xx;
 }
 
 void
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/obs405/obs600_machdep.c
--- a/sys/arch/evbppc/obs405/obs600_machdep.c   Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/obs405/obs600_machdep.c   Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obs600_machdep.c,v 1.15 2021/03/30 04:28:50 rin Exp $  */
+/*     $NetBSD: obs600_machdep.c,v 1.16 2021/08/03 09:25:44 rin Exp $  */
 /*     Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $    */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.15 2021/03/30 04:28:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.16 2021/08/03 09:25:44 rin Exp $");
 
 #include "opt_ddb.h"
 
@@ -153,11 +153,6 @@
        if (boothowto & RB_KDB)
                Debugger();
 #endif
-
-       /*
-        * Look for the ibm4xx modules in the right place.
-        */
-       module_machine = module_machine_ibm4xx;
 }
 
 void
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/virtex/machdep.c
--- a/sys/arch/evbppc/virtex/machdep.c  Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/virtex/machdep.c  Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $ */
+/*     $NetBSD: machdep.c,v 1.30 2021/08/03 09:25:44 rin Exp $ */
 
 /*
  * Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2021/03/30 02:41:14 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2021/08/03 09:25:44 rin Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -141,11 +141,6 @@
         */
        kgdb_connect(1);
 #endif /* KGDB */
-
-       /*
-        * Look for the ibm4xx modules in the right place.
-        */
-       module_machine = module_machine_ibm4xx;
 }
 
 /*
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/arch/evbppc/walnut/machdep.c
--- a/sys/arch/evbppc/walnut/machdep.c  Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/arch/evbppc/walnut/machdep.c  Tue Aug 03 09:25:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.67 2021/03/30 05:08:16 rin Exp $ */
+/*     $NetBSD: machdep.c,v 1.68 2021/08/03 09:25:44 rin Exp $ */
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.67 2021/03/30 05:08:16 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.68 2021/08/03 09:25:44 rin Exp $");
 
 #include "opt_ddb.h"
 
@@ -132,11 +132,6 @@
        if (boothowto & RB_KDB)
                Debugger();
 #endif
-
-       /*
-        * Look for the ibm4xx modules in the right place.
-        */
-       module_machine = module_machine_ibm4xx;
 }
 
 /*
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/modules/arch/archdirs.mk
--- a/sys/modules/arch/archdirs.mk      Tue Aug 03 07:58:50 2021 +0000
+++ b/sys/modules/arch/archdirs.mk      Tue Aug 03 09:25:43 2021 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: archdirs.mk,v 1.6 2020/07/04 21:02:16 chs Exp $
+#      $NetBSD: archdirs.mk,v 1.7 2021/08/03 09:25:44 rin Exp $
 
 # list of subdirs used per-platform
 
 .if ${MACHINE_ARCH} == "powerpc"
-ARCHDIR_SUBDIR=        powerpc/powerpc-ibm4xx powerpc/powerpc-booke
+ARCHDIR_SUBDIR=        powerpc/powerpc-booke
 .endif
 
 .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile
--- a/sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile  Tue Aug 03 07:58:50 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2020/06/27 06:50:00 rin Exp $
-
-BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.powerpc-ibm4xx.mk
-
-.include "../../compatsubdir.mk"
diff -r ed62cb21de65 -r 67b1bd5a7a5e sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk
--- a/sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk     Tue Aug 03 07:58:50 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#      $NetBSD: bsd.powerpc-ibm4xx.mk,v 1.1 2020/06/27 06:50:00 rin Exp $
-



Home | Main Index | Thread Index | Old Index