commit 7a994a0beabd03a6d4c51958993d1533c0805ee7
author qinglin.li <qinglin.li@amlogic.com> Mon Dec 05 15:04:40 2022 +0800
committer gerrit autosubmit <gerrit.autosubmit@amlogic.com> Tue Dec 13 06:16:57 2022 -0800
tree e7031de8e04beec27379c560a7eccd8fd62ca6fb
parent 0f89be2a4b2e40007fa21892f16b49339651c6eb

module: add none gki build option [1/1]

PD#SWPL-104098

Problem:
add none gki build option

Solution:
add none gki build option

Verify:
sc2

Change-Id: I6e7d660c3fea43de789627201b114592366b71bf
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>

amlogic_utils.sh

diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index b7d68d5..dc97460 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -27,6 +27,10 @@
 			KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10} ${ROOT_DIR}/${FRAGMENT_CONFIG_DEBUG}
 		fi
 	fi
+
+	if [[ -n ${UPGRADE_PROJECT} ]]; then
+		KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_UPGRADE}
+	fi
 }
 export -f pre_defconfig_cmds