From 9b1473ea86a9d3b5917b5da54f373f461279034a Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 7 Feb 2024 18:49:28 +0000 Subject: [PATCH] morello: make the default kernel purecap Adjust so that we default to GENERIC-MORELLO-PURECAP when doing manual builds. The new structure suggests we should make GENERIC-MORELLO be purecap and add -HYBRID kernels, but that's a proposition with much further reaching effects. --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 82b764a9254b..3e1ad4254eb2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1815,7 +1815,7 @@ NO_KERNELOBJ= t KERNCONF=${KERNFAST} .endif .endif -GENERIC_KERNCONF_SUFX_aarch64c= -MORELLO +GENERIC_KERNCONF_SUFX_aarch64c= -MORELLO-PURECAP GENERIC_KERNCONF_SUFX_powerpc64= 64 GENERIC_KERNCONF_SUFX_powerpc64le= 64LE GENERIC_KERNCONF_powerpcspe= MPC85XXSPE @@ -1827,7 +1827,7 @@ KRNLCONFDIR= ${KERNSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTOP}${KERNSRCDIR:C,^${.CURDIR},,} KERNCONFDIR?= ${KRNLCONFDIR} -.for _k in ${GENERIC_KERNCONF} MINIMAL${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}} ${GENERIC_KERNCONF}-MMCCAM ${GENERIC_KERNCONF}-PURECAP +.for _k in ${GENERIC_KERNCONF} MINIMAL${GENERIC_KERNCONF_SUFX_${TARGET_ARCH}} ${GENERIC_KERNCONF}-MMCCAM ${GENERIC_KERNCONF:S/-PURECAP$//} .if exists(${KERNCONFDIR}/${_k}) PKG_KERNCONF+= ${_k} .for _dbg in NODEBUG DEBUG