[patch] Typo fixes for earlier patch

genkernel-4.3.8-config-microcode.patch (text/plain), 2.05 KB, created by ZetaCorvi on 2023-11-01 18:18:38 UTC

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index d074005..9e9f65b 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' )
+			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' )
+			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[@]} )
@@ -1012,18 +1014,21 @@ config_kernel() {
 				esac
 				kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "${k}" "${cfg}"
 			done
-
 			required_kernel_options+=( 'CONFIG_MICROCODE' )
 			case "${MICROCODE}" in
 				amd)
-					required_kernel_options+=( 'CONFIG_MICROCODE_AMD' )
+					required_kernel_options+=( 'CONFIG_CPU_SUP_AMD' )
+					[ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_AMD' )
 					;;
 				intel)
-					required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' )
+					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' )
+					required_kernel_options+=( 'CONFIG_CPU_SUP_AMD' )
+					required_kernel_options+=( 'CONFIG_CPU_SUP_INTEL' )
+					[ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_AMD' )
+					[ ${KV_NUMERIC} -lt 6006 ] && required_kernel_options+=( 'CONFIG_MICROCODE_INTEL' )
 					;;
 			esac
 		else