From bc598bde08f90129fc2568b5bb6bb431d329eeda Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Fri, 6 Dec 2024 09:15:46 +0100
Subject: [PATCH] Sync arches (#340)

* Sync arches

* Fix
---
 linux-cachyos-bmq/auto-cpu-optimization.sh    | 71 ++++++++++++-------
 linux-cachyos-bore/auto-cpu-optimization.sh   | 71 ++++++++++++-------
 .../auto-cpu-optimization.sh                  | 71 ++++++++++++-------
 linux-cachyos-eevdf/auto-cpu-optimization.sh  | 71 ++++++++++++-------
 .../auto-cpu-optimization.sh                  | 71 ++++++++++++-------
 linux-cachyos-lts/auto-cpu-optimization.sh    | 71 ++++++++++++-------
 linux-cachyos-rc/auto-cpu-optimization.sh     | 71 ++++++++++++-------
 .../auto-cpu-optimization.sh                  | 71 ++++++++++++-------
 linux-cachyos-server/auto-cpu-optimization.sh | 71 ++++++++++++-------
 linux-cachyos/auto-cpu-optimization.sh        | 71 ++++++++++++-------
 10 files changed, 450 insertions(+), 260 deletions(-)

diff --git a/linux-cachyos-bmq/auto-cpu-optimization.sh b/linux-cachyos-bmq/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-bmq/auto-cpu-optimization.sh
+++ b/linux-cachyos-bmq/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos-bore/auto-cpu-optimization.sh b/linux-cachyos-bore/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-bore/auto-cpu-optimization.sh
+++ b/linux-cachyos-bore/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos-deckify/auto-cpu-optimization.sh b/linux-cachyos-deckify/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-deckify/auto-cpu-optimization.sh
+++ b/linux-cachyos-deckify/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos-eevdf/auto-cpu-optimization.sh b/linux-cachyos-eevdf/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-eevdf/auto-cpu-optimization.sh
+++ b/linux-cachyos-eevdf/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos-hardened/auto-cpu-optimization.sh b/linux-cachyos-hardened/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-hardened/auto-cpu-optimization.sh
+++ b/linux-cachyos-hardened/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos-lts/auto-cpu-optimization.sh b/linux-cachyos-lts/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-lts/auto-cpu-optimization.sh
+++ b/linux-cachyos-lts/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos-rc/auto-cpu-optimization.sh b/linux-cachyos-rc/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-rc/auto-cpu-optimization.sh
+++ b/linux-cachyos-rc/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos-rt-bore/auto-cpu-optimization.sh b/linux-cachyos-rt-bore/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-rt-bore/auto-cpu-optimization.sh
+++ b/linux-cachyos-rt-bore/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos-server/auto-cpu-optimization.sh b/linux-cachyos-server/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos-server/auto-cpu-optimization.sh
+++ b/linux-cachyos-server/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}
diff --git a/linux-cachyos/auto-cpu-optimization.sh b/linux-cachyos/auto-cpu-optimization.sh
index 479d5c70..88665a08 100755
--- a/linux-cachyos/auto-cpu-optimization.sh
+++ b/linux-cachyos/auto-cpu-optimization.sh
@@ -13,40 +13,59 @@ check_gcc() {
 check_gcc
 
 # Get CPU type from GCC and convert to uppercase
-MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print toupper($2)}')
+MARCH=$(gcc -Q -march=native --help=target|grep -m1 march=|awk '{print $2}')
+
+# Sync with 0005-cachy.patch using
+# sed -E '/= -march=/!d;/^[+]/!d;/CONFIG_GENERIC_CPU/d;/-march=native/d;s/.+CONFIG_M([^)]+).+-march=([^ ]+).*/\2) MARCH=\1;;/g' 0005-cachy.patch
 
 # Check for specific CPU types and set MARCH variable accordingly
 case $MARCH in
-  ZNVER1) MARCH="ZEN";;
-  ZNVER2) MARCH="ZEN2";;
-  ZNVER3) MARCH="ZEN3";;
-  ZNVER4) MARCH="ZEN4";;
-  ZNVER5) MARCH="ZEN5";;
-  BDVER1) MARCH="BULLDOZER";;
-  BDVER2) MARCH="PILEDRIVER";;
-  BDVER3) MARCH="STEAMROLLER";;
-  BDVER4) MARCH="EXCAVATOR";;
-  BTVER1) MARCH="BOBCAT";;
-  BTVER2) MARCH="JAGUAR";;
-  AMDFAM10) MARCH="MK10";;
-  K8-SSE3) MARCH="K8SSE3";;
-  BONNELL) MARCH="ATOM";;
-  GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
-  MIVYBRIDGE)
-    scripts/config --disable CONFIG_AGP_AMD64 
-    scripts/config --disable CONFIG_MICROCODE_AMD
-    MARCH="MIVYBRIDGE";;
-  ICELAKE-CLIENT) MARCH="ICELAKE";;
+  bonnell) MARCH=ATOM;;
+  k8-sse3) MARCH=K8SSE3;;
+  amdfam10) MARCH=K10;;
+  barcelona) MARCH=BARCELONA;;
+  btver1) MARCH=BOBCAT;;
+  btver2) MARCH=JAGUAR;;
+  bdver1) MARCH=BULLDOZER;;
+  bdver2) MARCH=PILEDRIVER;;
+  bdver3) MARCH=STEAMROLLER;;
+  bdver4) MARCH=EXCAVATOR;;
+  znver1) MARCH=ZEN;;
+  znver2) MARCH=ZEN2;;
+  znver3) MARCH=ZEN3;;
+  znver4) MARCH=ZEN4;;
+  znver5) MARCH=ZEN5;;
+  nehalem) MARCH=NEHALEM;;
+  westmere) MARCH=WESTMERE;;
+  silvermont) MARCH=SILVERMONT;;
+  goldmont) MARCH=GOLDMONT;;
+  goldmont-plus) MARCH=GOLDMONTPLUS;;
+  sandybridge) MARCH=SANDYBRIDGE;;
+  ivybridge) MARCH=IVYBRIDGE;;
+  haswell) MARCH=HASWELL;;
+  broadwell) MARCH=BROADWELL;;
+  skylake) MARCH=SKYLAKE;;
+  skylake-avx512) MARCH=SKYLAKEX;;
+  cannonlake) MARCH=CANNONLAKE;;
+  icelake-server) MARCH=ICELAKE_SERVER;;
+  icelake-client) MARCH=ICELAKE_CLIENT;;
+  cascadelake) MARCH=CASCADELAKE;;
+  cooperlake) MARCH=COOPERLAKE;;
+  tigerlake) MARCH=TIGERLAKE;;
+  sapphirerapids) MARCH=SAPPHIRERAPIDS;;
+  rocketlake) MARCH=ROCKETLAKE;;
+  alderlake) MARCH=ALDERLAKE;;
+  raptorlake) MARCH=RAPTORLAKE;;
+  meteorlake) MARCH=METEORLAKE;;
+  emeraldrapids) MARCH=EMERALDRAPIDS;;
 esac
 
-# Add "M" prefix to MARCH variable
-MARCH2=M${MARCH}
+# If doesn't match, re-use the arch name (uppercased) 
 
 # Display detected CPU and apply optimization
 echo "----------------------------------"
 echo "| APPLYING AUTO-CPU-OPTIMIZATION |"
 echo "----------------------------------"
-echo "[*] DETECTED CPU (MARCH) : ${MARCH2}"
+echo "[*] DETECTED CPU (MARCH) : ${MARCH}"
 scripts/config -k --disable CONFIG_GENERIC_CPU
-scripts/config -k --enable CONFIG_${MARCH2}
+scripts/config -k --enable CONFIG_M${MARCH^^}