From 352835c8499f78840be5a59a19d954de9413289f Mon Sep 17 00:00:00 2001
From: Vamsi Krishna Lanka <quic_vamslank@quicinc.com>
Date: Fri, 10 Jun 2022 12:38:48 -0700
Subject: [PATCH] build.config: Remove the generation of system_dlkm twice

This commits avoids the generation of system_dlkm image in msm-kernel
as it is already being generated in common kernel.

Change-Id: I98a612ec611947f373e8facc29e407d74b832ca8
Signed-off-by: Vamsi Krishna Lanka <quic_vamslank@quicinc.com>
---
 build.config.msm.common    | 17 ++++++++---------
 build.config.msm.gki       |  1 +
 build.config.msm.kalama    |  3 +--
 build.config.msm.pineapple |  3 +--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/build.config.msm.common b/build.config.msm.common
index 62d6e11f248b..fbdabbc5049e 100644
--- a/build.config.msm.common
+++ b/build.config.msm.common
@@ -165,7 +165,7 @@ if [ "${BUILD_VENDOR_DLKM}" == "1" ]; then
   COMBINED_MODULE_LIST=$(mktemp)
 fi
 
-if [[ "${BUILD_SYSTEM_DLKM}" == "1"  && ! -z "${SYSTEM_DLKM_MODULES_LIST}" ]]; then
+if [[ "${PREPARE_SYSTEM_DLKM}" == "1"  && ! -z "${SYSTEM_DLKM_MODULES_LIST}" ]]; then
   {
     awk -F'/' '{print $NF}' ${SYSTEM_DLKM_MODULES_LIST}
     [ -f "${MODULES_LIST}" ] && cat "${MODULES_LIST}"
@@ -200,16 +200,15 @@ if [ "${BUILD_VENDOR_DLKM}" == "1" ]; then
 fi
 
 function prepare_system_dlkm() {
-   if [ -e "${KERNEL_DIR}/modules.systemdlkm_blocklist.${CONFIG_TARGET}" ]; then
-    SYSTEM_DLKM_MODULES_BLOCKLIST="${KERNEL_DIR}/modules.systemdlkm_blocklist.${CONFIG_TARGET}"
-    cp $SYSTEM_DLKM_MODULES_BLOCKLIST ${DIST_DIR}/system_dlkm.modules.blocklist
+  if [ "${PREPARE_SYSTEM_DLKM}" == "1" ]; then
+    if [ -e "${KERNEL_DIR}/modules.systemdlkm_blocklist.${CONFIG_TARGET}" ]; then
+      SYSTEM_DLKM_MODULES_BLOCKLIST="${KERNEL_DIR}/modules.systemdlkm_blocklist.${CONFIG_TARGET}"
+      cp $SYSTEM_DLKM_MODULES_BLOCKLIST ${DIST_DIR}/system_dlkm.modules.blocklist
+    fi
+    SUPER_IMAGE_CONTENTS+=("${DIST_DIR}/system_dlkm.img")
   fi
-  SUPER_IMAGE_CONTENTS+=("${DIST_DIR}/system_dlkm.img")
 }
-
-if [ "${BUILD_SYSTEM_DLKM}" == "1" ]; then
-  append_cmd DIST_CMDS 'prepare_system_dlkm'
-fi
+append_cmd DIST_CMDS 'prepare_system_dlkm'
 
 KERNEL_BINARY=Image
 
diff --git a/build.config.msm.gki b/build.config.msm.gki
index c80d4c2606a3..061b89286df0 100644
--- a/build.config.msm.gki
+++ b/build.config.msm.gki
@@ -34,6 +34,7 @@ function sanity_check_abi() {
 		# In that case, turn on some options for trimming and strict mode
 		# which would normally be disabled because they conflict with
 		# mixed build
+		PREPARE_SYSTEM_DLKM=0
 		if [ "${VARIANT}" = gki ]; then
 			TRIM_NONLISTED_KMI=1
 			KMI_SYMBOL_LIST_STRICT_MODE=1
diff --git a/build.config.msm.kalama b/build.config.msm.kalama
index f50138d90e18..356cb96322c9 100644
--- a/build.config.msm.kalama
+++ b/build.config.msm.kalama
@@ -14,9 +14,8 @@ BOOT_IMAGE_HEADER_VERSION=4
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096
 BUILD_VENDOR_DLKM=1
-BUILD_SYSTEM_DLKM=1
+PREPARE_SYSTEM_DLKM=1
 SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
-SYSTEM_DLKM_MODULES_ORDER=android/gki_aarch64_modules
 SUPER_IMAGE_SIZE=0x10000000
 TRIM_UNUSED_MODULES=1
 BUILD_INIT_BOOT_IMG=1
diff --git a/build.config.msm.pineapple b/build.config.msm.pineapple
index b8e5196997ac..c0304ba0d4d5 100644
--- a/build.config.msm.pineapple
+++ b/build.config.msm.pineapple
@@ -14,9 +14,8 @@ BOOT_IMAGE_HEADER_VERSION=4
 BASE_ADDRESS=0x80000000
 PAGE_SIZE=4096
 BUILD_VENDOR_DLKM=1
-BUILD_SYSTEM_DLKM=1
+PREPARE_SYSTEM_DLKM=1
 SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
-SYSTEM_DLKM_MODULES_ORDER=android/gki_aarch64_modules
 SUPER_IMAGE_SIZE=0x10000000
 TRIM_UNUSED_MODULES=1
 BUILD_INIT_BOOT_IMG=1