Source-Changes-HG archive

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

[src/trunk]: src/sys/modules/arch Rename module directory for ibm4xx from /st...



details:   https://anonhg.NetBSD.org/src/rev/50bc20db041f
branches:  trunk
changeset: 973315:50bc20db041f
user:      rin <rin%NetBSD.org@localhost>
date:      Sat Jun 27 06:50:00 2020 +0000

description:
Rename module directory for ibm4xx from /stand/powerpc-4xx to
/stand/powerpc-ibm4xx to match with what we set in evbppc_machdep.c:

https://nxr.netbsd.org/xref/src/sys/arch/evbppc/evbppc/evbppc_machdep.c#86

(And we use ibm4xx not 4xx for directory in sys/arch/powerpc.)

Note that we had never enabled MODULAR for ibm4xx yet; kernel with
MODULAR option was unable to build. This should be why this discrepancy
had never been found until today...

diffstat:

 sys/modules/arch/archdirs.mk                                  |   4 +-
 sys/modules/arch/powerpc/powerpc-4xx/Makefile                 |   5 ---
 sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk       |  17 -----------
 sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile              |   5 +++
 sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk |  17 +++++++++++
 5 files changed, 24 insertions(+), 24 deletions(-)

diffs (78 lines):

diff -r 56a051e10156 -r 50bc20db041f sys/modules/arch/archdirs.mk
--- a/sys/modules/arch/archdirs.mk      Sat Jun 27 05:39:07 2020 +0000
+++ b/sys/modules/arch/archdirs.mk      Sat Jun 27 06:50:00 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: archdirs.mk,v 1.4 2018/09/19 16:11:53 maxv Exp $
+#      $NetBSD: archdirs.mk,v 1.5 2020/06/27 06:50:00 rin Exp $
 
 # list of subdirs used per-platform
 
@@ -11,7 +11,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc"
-ARCHDIR_SUBDIR=        powerpc/powerpc-4xx powerpc/powerpc-booke
+ARCHDIR_SUBDIR=        powerpc/powerpc-ibm4xx powerpc/powerpc-booke
 .endif
 
 .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
diff -r 56a051e10156 -r 50bc20db041f sys/modules/arch/powerpc/powerpc-4xx/Makefile
--- a/sys/modules/arch/powerpc/powerpc-4xx/Makefile     Sat Jun 27 05:39:07 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2011/06/15 09:45:59 mrg Exp $
-
-BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.powerpc-4xx.mk
-
-.include "../../compatsubdir.mk"
diff -r 56a051e10156 -r 50bc20db041f sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk
--- a/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk   Sat Jun 27 05:39:07 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#      $NetBSD: bsd.powerpc-4xx.mk,v 1.3 2011/06/22 18:17:17 matt Exp $
-
-.ifndef _BSD_POWERPC_4XX_MK_
-_BSD_POWERPC_4XX_MK_=1
-
-KMODULEARCHDIR:=       powerpc-4xx
-
-CPPFLAGS+=     -mcpu=403
-PPC_IBM4XX=    1
-
-# hack into bsd.kmodule.mk
-PPC_INTR_IMPL=\"powerpc/intr.h\"
-PPC_PCI_MACHDEP_IMPL=\"powerpc/pci_machdep.h\"
-
-AFLAGS+=       -mcpu=403
-
-.endif # _BSD_POWERPC_4XX_MK_
diff -r 56a051e10156 -r 50bc20db041f sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile  Sat Jun 27 06:50:00 2020 +0000
@@ -0,0 +1,5 @@
+#      $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 56a051e10156 -r 50bc20db041f sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk     Sat Jun 27 06:50:00 2020 +0000
@@ -0,0 +1,17 @@
+#      $NetBSD: bsd.powerpc-ibm4xx.mk,v 1.1 2020/06/27 06:50:00 rin Exp $
+
+.ifndef _BSD_POWERPC_IBM4XX_MK_
+_BSD_POWERPC_IBM4XX_MK_=1
+
+KMODULEARCHDIR:=       powerpc-ibm4xx
+
+CPPFLAGS+=     -mcpu=403
+PPC_IBM4XX=    1
+
+# hack into bsd.kmodule.mk
+PPC_INTR_IMPL=\"powerpc/intr.h\"
+PPC_PCI_MACHDEP_IMPL=\"powerpc/pci_machdep.h\"
+
+AFLAGS+=       -mcpu=403
+
+.endif # _BSD_POWERPC_IBM4XX_MK_



Home | Main Index | Thread Index | Old Index