Author: bdragon
Date: Sun Sep 13 18:24:15 2020
New Revision: 365694
URL: https://svnweb.freebsd.org/changeset/base/365694
Log:
[PowerPC64LE] Ensure nvram is built on powerpc64le.
Fix some cases where conditionals that were trying to exclude powerpcspe
were also excluding powerpc64le.
Sponsored by: Tag1 Consulting, Inc.
Modified:
head/include/Makefile
head/sys/modules/Makefile
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Sun Sep 13 17:36:43 2020 (r365693)
+++ head/include/Makefile Sun Sep 13 18:24:15 2020 (r365694)
@@ -93,7 +93,7 @@ INCS+= iconv.h
LSUBDIRS+= dev/usb
.endif
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe"
_dev_powermac_nvram= dev/powermac_nvram
.endif
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Sun Sep 13 17:36:43 2020 (r365693)
+++ head/sys/modules/Makefile Sun Sep 13 18:24:15 2020 (r365694)
@@ -784,7 +784,7 @@ _ipmi= ipmi
_ixl= ixl
_nvram= opal_nvram
.endif
-.if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe"
# Don't build powermac_nvram for powerpcspe, it's never supported.
_nvram+= powermac_nvram
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
