commit e542675e9e23ad1b65c4df068228d5ab86076ba8
author Wanwei Jiang <wanwei.jiang@amlogic.com> Mon Jul 03 00:56:39 2023 +0800
committer gerrit autosubmit <gerrit.autosubmit@amlogic.com> Wed Jul 05 22:45:20 2023 -0700
tree 56f6206d6b77a11c6615a3d9188c13b7b5bcb49e
parent b66cafed3f1d773f727dc8a88747bee7792b828b

android: support gki2.0 gki1.0 and nonGKI [1/1]

PD#SWPL-130287

Problem:
support gki2.0 gki1.0 and nonGKI

Solution:
support gki2.0 gki1.0 and nonGKI

Verify:
ohm

Change-Id: I1529b253f58c814979fa48de4cf960b34b1aff16
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>

amlogic_utils.sh

diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index 86cee1e..fda33ad 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -15,9 +15,7 @@
 		else
 			if [[ ${GKI_CONFIG} == gki_20 ]]; then
 				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} ${temp_file}
-			elif [[ ${GKI_CONFIG} == gki_10 ]]; then
-				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} ${temp_file}
-			elif [[ ${GKI_CONFIG} == gki_debug ]]; then
+			else
 				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} ${temp_file}
 			fi
 		fi
@@ -35,9 +33,7 @@
 				else
 					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}
 				fi
-			elif [[ ${GKI_CONFIG} == gki_10 ]]; then
-				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}
-			elif [[ ${GKI_CONFIG} == gki_debug ]]; then
+			else
 				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
@@ -1328,10 +1324,6 @@
 			GKI_CONFIG=gki_10
 			shift
 			;;
-		--gki_debug)
-			GKI_CONFIG=gki_debug
-			shift
-			;;
 		--fast_build)
 			FAST_BUILD=1
 			shift
@@ -1449,8 +1441,6 @@
 		RM_KERNEL_BUILD_VAR_FILE=1
 	fi
 
-	GKI_CONFIG=${GKI_CONFIG:-gki_debug}
-
 	export CROSS_COMPILE=
 
 	if [ "${ABI}" -eq "1" ]; then