Module Name: src
Committed By: rin
Date: Thu Jul 11 13:46:45 UTC 2024
Modified Files:
src/etc/etc.evbmips: Makefile.inc
Log Message:
etc.evbmips: Try to make `.if` labyrinth less confusing, NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/etc/etc.evbmips/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.28 src/etc/etc.evbmips/Makefile.inc:1.29
--- src/etc/etc.evbmips/Makefile.inc:1.28 Thu Jul 11 13:40:19 2024
+++ src/etc/etc.evbmips/Makefile.inc Thu Jul 11 13:46:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2024/07/11 13:40:19 rin Exp $
+# $NetBSD: Makefile.inc,v 1.29 2024/07/11 13:46:45 rin Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -8,15 +8,20 @@
KERNEL_SUFFIXES= srec ub elf32
-.if ${MACHINE_ARCH} == "mipsel"
-KERNEL_SETS= ALCHEMY CI20 CPMBR1400 DBAU1500 DBAU1550 GDIUM
-KERNEL_SETS+= MALTA MTX-1 OMSAL400
-BUILD_KERNELS= INSTALL_CI20 INSTALL_OMSAL400 INSTALL_MALTA
+.if !${MACHINE_MIPS64}
+# 32-bit common
+KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA MIPSSIM
+BUILD_KERNELS= INSTALL_MALTA
-KERNEL_SETS+= P4032 P5064 P6032
-KERNEL_SETS+= MIPSSIM
+. if ${MACHINE_ARCH} == "mipsel"
+KERNEL_SETS+= CI20 CPMBR1400 GDIUM MTX-1 OMSAL400 P4032 P5064 P6032
+BUILD_KERNELS+= INSTALL_CI20 INSTALL_OMSAL400
+. else
+KERNEL_SETS+= DB120 RB433UAH
+. endif
-.elif ${MACHINE_MIPS64}
+.else
+# 64-bit common
KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64
BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64
@@ -31,11 +36,6 @@ KERNEL_SETS+= GDIUM64
KERNEL_SETS+= OCTEON
BUILD_KERNELS+= INSTALL_OCTEON
. endif
-.else
-KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH
-BUILD_KERNELS= INSTALL_MALTA
-
-KERNEL_SETS+= MIPSSIM
.endif
# SBMIPS has a kernel for all targets