Module Name: src Committed By: rin Date: Sat Jun 27 06:50:00 UTC 2020
Modified Files: src/sys/modules/arch: archdirs.mk Added Files: src/sys/modules/arch/powerpc/powerpc-ibm4xx: Makefile bsd.powerpc-ibm4xx.mk Removed Files: src/sys/modules/arch/powerpc/powerpc-4xx: Makefile bsd.powerpc-4xx.mk Log Message: 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... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/modules/arch/archdirs.mk cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/powerpc/powerpc-4xx/Makefile cvs rdiff -u -r1.3 -r0 \ src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile \ src/sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/modules/arch/archdirs.mk diff -u src/sys/modules/arch/archdirs.mk:1.4 src/sys/modules/arch/archdirs.mk:1.5 --- src/sys/modules/arch/archdirs.mk:1.4 Wed Sep 19 16:11:53 2018 +++ src/sys/modules/arch/archdirs.mk Sat Jun 27 06:50:00 2020 @@ -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" Added files: Index: src/sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile diff -u /dev/null src/sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile:1.1 --- /dev/null Sat Jun 27 06:50:00 2020 +++ src/sys/modules/arch/powerpc/powerpc-ibm4xx/Makefile Sat Jun 27 06:50:00 2020 @@ -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" Index: src/sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk diff -u /dev/null src/sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk:1.1 --- /dev/null Sat Jun 27 06:50:00 2020 +++ src/sys/modules/arch/powerpc/powerpc-ibm4xx/bsd.powerpc-ibm4xx.mk Sat Jun 27 06:50:00 2020 @@ -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_