Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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...
This commit is contained in:
rin 2020-06-27 06:50:00 +00:00
parent 77128b9fa3
commit 3b1af247ce
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/modules/arch/archdirs.mk
View File

@ -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 @@ ARCHDIR_SUBDIR= x86/i386pae-xen
.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"

5
sys/modules/arch/powerpc/powerpc-4xx/Makefile
View File

@ -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"

17
sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk
View File

@ -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_

5
sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile Normal file
View File

@ -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"

17
sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk Normal file
View File

@ -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_