From c141a8c304c01cf415b50ef53f9c92ca4a2d9026 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Thu, 22 Dec 2022 15:41:12 +0100
Subject: [PATCH] Only set custom command line options if the variable is not
 empty

---
 linux-tkg-config/prepare | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 99c2ccd..8834523 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -896,14 +896,19 @@ _tkg_srcprep() {
     scripts/config --set-val "RCU_BOOST_DELAY" "0"
   fi
   _disable "NTP_PPS" "ZSWAP_COMPRESSOR_DEFAULT_LZO" "PROFILE_ALL_BRANCHES"
-  _enable "CRYPTO_LZ4" "CRYPTO_LZ4HC" "LZ4_COMPRESS" "LZ4HC_COMPRESS" "ZSWAP_COMPRESSOR_DEFAULT_LZ4" "X86_AMD_PSTATE" "AMD_PINCTRL" "CMDLINE_BOOL"
-  _disable "DEBUG_FORCE_FUNCTION_ALIGN_64B" "X86_P6_NOP" "CMDLINE_OVERRIDE"
+  _enable "CRYPTO_LZ4" "CRYPTO_LZ4HC" "LZ4_COMPRESS" "LZ4HC_COMPRESS" "ZSWAP_COMPRESSOR_DEFAULT_LZ4" "X86_AMD_PSTATE" "AMD_PINCTRL"
+  _disable "DEBUG_FORCE_FUNCTION_ALIGN_64B" "X86_P6_NOP"
   scripts/config --set-str "ZSWAP_COMPRESSOR_DEFAULT" "lz4"
-  scripts/config --set-str "CMDLINE" "${_custom_commandline}"
   _enable "CPU_FREQ_DEFAULT_GOV_SCHEDUTIL"
   _disable "CPU_FREQ_DEFAULT_GOV_ONDEMAND" "CPU_FREQ_DEFAULT_GOV_CONSERVATIVE" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE" "CPU_FREQ_DEFAULT_GOV_PERFORMANCE_NODEF"
   _module "BLK_DEV_LOOP"
 
+  if [ -n "$_custom_commandline" ]; then
+    _enable "CMDLINE_BOOL"
+    _disable "CMDLINE_OVERRIDE"
+    scripts/config --set-str "CMDLINE" "${_custom_commandline}"
+  fi
+
   # openrgb
   _module "I2C_NCT6775"