From dce0e81cfdf05965b26cfc492fc55ca540d6e4a6 Mon Sep 17 00:00:00 2001
From: Anay Wadhera <awadhera@berkeley.edu>
Date: Mon, 9 Nov 2020 16:36:08 -0800
Subject: kernelscripts: Support building kernels without module support.

Change-Id: Ice147125fea1658e4c7bb9b5df15cfc6df145afe
---
 buildkernel.sh        | 14 ++++++++++----
 kernel_definitions.mk |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/buildkernel.sh b/buildkernel.sh
index ae0ba52..b485133 100755
--- a/buildkernel.sh
+++ b/buildkernel.sh
@@ -197,7 +197,9 @@ copy_all_to_prebuilt()
 		mkdir -p ${PREBUILT_OUT}
 	fi
 
-	copy_modules_to_prebuilt ${PREBUILT_OUT}
+	if [ ! -z "$MODULES" ]; then
+		copy_modules_to_prebuilt ${PREBUILT_OUT}
+	fi
 
 	#copy necessary files from the out directory
 	echo "============="
@@ -397,10 +399,14 @@ else
 	make_defconfig
 	headers_install
 	build_kernel
-	modules_install
+	if [ ! -z "$MODULES" ]; then
+		modules_install
+	fi
 	copy_all_to_prebuilt ${KERNEL_BINS}
-	archive_kernel_modules
-	save_unstripped_modules
+	if [ ! -z "$MODULES" ]; then
+		archive_kernel_modules
+		save_unstripped_modules
+	fi
 fi
 
 exit 0
diff --git a/kernel_definitions.mk b/kernel_definitions.mk
index fdbb215..81d3f69 100644
--- a/kernel_definitions.mk
+++ b/kernel_definitions.mk
@@ -155,6 +155,7 @@ cmd := $(PATH_OVERRIDE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE
 _x := $(shell $(cmd))
 else
 TARGET_USES_UNCOMPRESSED_KERNEL := $(shell grep "CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y" $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG))
+TARGET_HAS_MODULES := $(shell grep "=m" $(TARGET_KERNEL_SOURCE)/arch/arm64/configs/$(KERNEL_DEFCONFIG))
 endif
 
 # Generate the defconfig file from the fragments
@@ -280,6 +281,7 @@ define build-kernel
 	VENDOR_RAMDISK_KERNEL_MODULES="$(VENDOR_RAMDISK_KERNEL_MODULES)" \
 	TARGET_PRODUCT=$(TARGET_BOARD_PLATFORM) \
 	DTS_VENDOR=$(TARGET_DTS_VENDOR) \
+	MODULES=$(TARGET_HAS_MODULES) \
 	device/qcom/kernelscripts/buildkernel.sh \
 	$(real_cc) \
 	$(TARGET_KERNEL_MAKE_ENV)
-- 
cgit v1.2.3