commit: 4c52a1b8f83494c72d036f0955c5ad57c51e554e Author: Michal Privoznik <michal.privoznik <AT> gmail <DOT> com> AuthorDate: Fri Dec 8 13:16:50 2023 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Fri Jan 19 18:26:25 2024 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4c52a1b8
gen_configkernel: Prepare for kernel-6.6 The microcode related config options were removed in [1] and microcode loading is enabled when support for corresponding CPU is enabled. Basically, this is equivalent to renaming options: CONFIG_MICROCODE_AMD -> CONFIG_CPU_SUP_AMD CONFIG_MICROCODE_INTEL -> CONFIG_CPU_SUP_INTEL Reflect this change in gen_configkernel.sh. Bug: https://bugs.gentoo.org/913659 1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e6bcfdd75d53390a67f67237f4eafc77d9772056 Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com> Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> gen_configkernel.sh | 16 ++++++++++------ genkernel | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index d074005..17f9eaf 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -991,11 +991,13 @@ config_kernel() { [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode+=( 'CONFIG_MICROCODE_EARLY' ) # Intel - kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' ) + [ ${KV_NUMERIC} -ge 6006 ] && kconfigs_microcode_intel+=( 'CONFIG_CPU_SUP_INTEL' ) + [ ${KV_NUMERIC} -lt 6006 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL' ) [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_intel+=( 'CONFIG_MICROCODE_INTEL_EARLY' ) # AMD - kconfigs_microcode_amd=( 'CONFIG_MICROCODE_AMD' ) + [ ${KV_NUMERIC} -ge 6006 ] && kconfigs_microcode_amd+=( 'CONFIG_CPU_SUP_AMD' ) + [ ${KV_NUMERIC} -lt 6006 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD' ) [ ${KV_NUMERIC} -le 4003 ] && kconfigs_microcode_amd+=( 'CONFIG_MICROCODE_AMD_EARLY' ) [[ "${MICROCODE}" == all ]] && kconfigs_microcode+=( ${kconfigs_microcode_amd[@]} ${kconfigs_microcode_intel[@]} ) @@ -1016,14 +1018,16 @@ config_kernel() { required_kernel_options+=( 'CONFIG_MICROCODE' ) case "${MICROCODE}" in amd) - required_kernel_options+=( 'CONFIG_MICROCODE_AMD' ) + [ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_AMD' ) + [ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_AMD' ) ;; intel) - required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' ) + [ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_INTEL' ) + [ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' ) ;; all) - required_kernel_options+=( 'CONFIG_MICROCODE_AMD' ) - required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' ) + [ ${KV_NUMERIC} -ge 6006 ] && required_kernel_options+=( 'CONFIG_CPU_SUP_AMD' 'CONFIG_CPU_SUP_INTEL' ) + [ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_AMD' 'CONFIG_MICROCODE_INTEL' ) ;; esac else diff --git a/genkernel b/genkernel index ab0e9d6..feaaad6 100755 --- a/genkernel +++ b/genkernel @@ -2,7 +2,7 @@ # $Id$ PATH="${PATH}:/sbin:/usr/sbin" -GK_V='4.3.8' +GK_V='4.3.9' # Normalize locales export LC_ALL=C
