diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 3b5e9bba94db..14e4f810badf 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -109,6 +109,7 @@ CONFIG_MSM_CDSP_LOADER=m
 CONFIG_UIO_MSM_SHAREDMEM=m
 CONFIG_QCOM_SOCINFO=m
 CONFIG_BTFM_SLIM=m
+CONFIG_CFI_PERMISSIVE=y
 # CONFIG_SND_SOC_WCD9335 is not set
 # CONFIG_SLIM_QCOM_CTRL is not set
 # CONFIG_SLIM_QCOM_NGD_CTRL is not set
diff --git a/scripts/gki/fragment_menuconfig.sh b/scripts/gki/fragment_menuconfig.sh
index fc40e238e3be..2bfd9e9d64fe 100755
--- a/scripts/gki/fragment_menuconfig.sh
+++ b/scripts/gki/fragment_menuconfig.sh
@@ -32,6 +32,7 @@ KERN_MAKE_ARGS="ARCH=$ARCH \
 		HOSTCC=$HOSTCC \
 		HOSTLD=$HOSTLD \
 		HOSTAR=$HOSTAR \
+		LD=$LD \
 		"
 
 # Allyes fragment temporarily created on GKI config fragment
diff --git a/scripts/gki/generate_defconfig.sh b/scripts/gki/generate_defconfig.sh
index 21cda67402b0..2d71a37374b7 100755
--- a/scripts/gki/generate_defconfig.sh
+++ b/scripts/gki/generate_defconfig.sh
@@ -32,6 +32,7 @@ KERN_MAKE_ARGS="ARCH=$ARCH \
 		HOSTCC=$HOSTCC \
 		HOSTLD=$HOSTLD \
 		HOSTAR=$HOSTAR \
+		LD=$LD \
 		"
 
 # Allyes fragment temporarily created on GKI config fragment