gki: rename to follow gki rule [1/1]

PD#SWPL-93926

Problem:
rename to follow gki rule

Solution:
rename to follow gki rule

Verify:
sc2

Change-Id: Ia01d7f6b94083fdb47392425847e0d150db010bc
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index f58c9e8..9f72ef2 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -6,12 +6,12 @@
 		export PATH=${PATH}:/usr/bin/
 	fi
 
-	if [[ ${GKI_CONFIG} == gki ]]; then
-		KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/${ARCH}/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG}
-	elif [[ ${GKI_CONFIG} == gki_user ]]; then
-		KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/${ARCH}/configs/${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_OPTIMIZE}
-	elif [[ ${GKI_CONFIG} == gki_userdebug ]]; then
-		KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/${ARCH}/configs/${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_OPTIMIZE} ${ROOT_DIR}/${FRAGMENT_CONFIG_DEBUG}
+	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}
+	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
+		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
 }
 export -f pre_defconfig_cmds
@@ -20,7 +20,7 @@
 	if [[ ${CHECK_DEFCONFIG} -eq "1" ]]; then
 		check_defconfig
 	fi
-	rm ${ROOT_DIR}/${KERNEL_DIR}/arch/${ARCH}/configs/${DEFCONFIG}
+	rm ${ROOT_DIR}/${KCONFIG_DEFCONFIG}
 }
 export -f post_defconfig_cmds
 
diff --git a/android/abi_gki_aarch64_amlogic.10 b/android/abi_gki_aarch64_amlogic.10
new file mode 100644
index 0000000..d756387
--- /dev/null
+++ b/android/abi_gki_aarch64_amlogic.10
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+[abi_symbol_list]
+
diff --git a/android/abi_gki_aarch64_amlogic.debug b/android/abi_gki_aarch64_amlogic.debug
index d666357..ec462af 100644
--- a/android/abi_gki_aarch64_amlogic.debug
+++ b/android/abi_gki_aarch64_amlogic.debug
@@ -4,3 +4,38 @@
   debug_file_write
   debug_file_read
 
+# page trace illegal symbol:
+  unpack_ip
+  pack_ip
+  find_page_base
+  get_page_trace
+  set_page_trace
+  reset_page_trace
+  ion_cma_allocated
+
+  cma_mmu_op
+  set_dump_dmc_func
+
+# amlogic debug illegal symbol:
+  irq_trace_start_hook
+  irq_trace_stop_hook
+  meson_atrace
+  pstore_io_save
+  __arm_smccc_smc_glue
+  __tracepoint_softirq_entry
+  __tracepoint_softirq_exit
+  dump_cpu_task
+  debug_filp_open
+  debug_vfs_setxattr
+
+# v4l2 vendor hooks
+  __tracepoint_android_vh_v4l2_meta_ptr_update
+  __tracepoint_android_vh_v4l2_fill_fmtdesc
+  __tracepoint_android_vh_v4l2_strparm_save
+  __tracepoint_android_vh_v4l2_strparm_restore
+
+# CFG80211: cfg80211.ko
+  rfkill_set_sw_state
+
+# usb related
+  crg_otg_write_UDC
diff --git a/android/abi_gki_aarch64_amlogic.optimize b/android/abi_gki_aarch64_amlogic.optimize
deleted file mode 100644
index 199b028..0000000
--- a/android/abi_gki_aarch64_amlogic.optimize
+++ /dev/null
@@ -1,39 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-
-[abi_symbol_list]
-
-# page trace illegal symbol:
-  unpack_ip
-  pack_ip
-  find_page_base
-  get_page_trace
-  set_page_trace
-  reset_page_trace
-  ion_cma_allocated
-
-  cma_mmu_op
-  set_dump_dmc_func
-
-# amlogic debug illegal symbol:
-  irq_trace_start_hook
-  irq_trace_stop_hook
-  meson_atrace
-  pstore_io_save
-  __arm_smccc_smc_glue
-  __tracepoint_softirq_entry
-  __tracepoint_softirq_exit
-  dump_cpu_task
-  debug_filp_open
-  debug_vfs_setxattr
-
-# v4l2 vendor hooks
-  __tracepoint_android_vh_v4l2_meta_ptr_update
-  __tracepoint_android_vh_v4l2_fill_fmtdesc
-  __tracepoint_android_vh_v4l2_strparm_save
-  __tracepoint_android_vh_v4l2_strparm_restore
-
-# CFG80211: cfg80211.ko
-  rfkill_set_sw_state
-
-# usb related
-  crg_otg_write_UDC
diff --git a/arch/arm/configs/amlogic_gki.10 b/arch/arm/configs/amlogic_gki.10
new file mode 100644
index 0000000..4c532ec
--- /dev/null
+++ b/arch/arm/configs/amlogic_gki.10
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+# early console
+CONFIG_AMLOGIC_SERIAL_EARLY_CONSOLE=y
+
+# amlogic-i2c.ko
+CONFIG_I2C_COMPAT=y
diff --git a/arch/arm/configs/amlogic_gki.debug b/arch/arm/configs/amlogic_gki.debug
index 21bdd30..d6418d8 100644
--- a/arch/arm/configs/amlogic_gki.debug
+++ b/arch/arm/configs/amlogic_gki.debug
@@ -6,3 +6,44 @@
 
 CONFIG_AMLOGIC_DEBUG_FILE=y
 # ONFIG_AMLOGIC_SAMPLES_DEBUG_FILE_TEST=m
+
+# build in for amlogic memory change
+CONFIG_CMA_SIZE_MBYTES=8
+CONFIG_AMLOGIC_MEMORY_EXTEND=y
+CONFIG_AMLOGIC_PAGE_TRACE=y
+CONFIG_AMLOGIC_SLAB_TRACE=y
+CONFIG_AMLOGIC_CMA=y
+CONFIG_AMLOGIC_VMAP=y
+CONFIG_AMLOGIC_MEM_DEBUG=y
+CONFIG_AMLOGIC_FILE_CACHE=y
+CONFIG_AMLOGIC_STACKPROTECTOR=y
+CONFIG_AMLOGIC_USER_FAULT=y
+CONFIG_AMLOGIC_WATCHPOINT=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_DMABUF_HEAPS_SYSTEM=m
+CONFIG_AMLOGIC_ZSTD=y
+CONFIG_DMA_RESTRICTED_POOL=n
+
+# debug builtin
+CONFIG_AMLOGIC_DEBUG=y
+CONFIG_AMLOGIC_DEBUG_LOCKUP=y
+CONFIG_AMLOGIC_DEBUG_ATRACE=y
+CONFIG_AMLOGIC_BOOT_TIME=y
+CONFIG_AMLOGIC_DEBUG_PRINTK=y
+CONFIG_AMLOGIC_DEBUG_FTRACE_PSTORE=y
+CONFIG_AMLOGIC_DEBUG_SCRAMBLER_RAMOOPS=y
+CONFIG_PSTORE_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_AMLOGIC_DEBUG_RELABEL=y
+CONFIG_AMLOGIC_DEBUG_RELABEL_GKI=n
+
+# usb xxx ko
+CONFIG_AMLOGIC_COMMON_USB=y
+
+#cfg80211.ko
+CONFIG_NL80211_TESTMODE=y
+CONFIG_CFG80211_WEXT=y
+
+# v4l2 vendor hooks
+CONFIG_ANDROID_KABI_RESERVE=y
+CONFIG_AMLOGIC_V4L2=y
diff --git a/arch/arm/configs/amlogic_gki.fragment b/arch/arm/configs/amlogic_gki.fragment
index b45e9fd..7507d9c 100644
--- a/arch/arm/configs/amlogic_gki.fragment
+++ b/arch/arm/configs/amlogic_gki.fragment
@@ -252,6 +252,7 @@
 
 # amlogic-rtc.ko
 CONFIG_AMLOGIC_RTC_DRV_MESON_VRTC=m
+CONFIG_AMLOGIC_MESON_RTC=m
 
 # amlogic-irblaster.ko
 CONFIG_AMLOGIC_IRBLASTER=m
diff --git a/arch/arm/configs/amlogic_gki.optimize b/arch/arm/configs/amlogic_gki.optimize
deleted file mode 100644
index 5f99095..0000000
--- a/arch/arm/configs/amlogic_gki.optimize
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-
-# early console
-CONFIG_AMLOGIC_SERIAL_EARLY_CONSOLE=y
-
-# build in for amlogic memory change
-CONFIG_CMA_SIZE_MBYTES=8
-CONFIG_AMLOGIC_MEMORY_EXTEND=y
-CONFIG_AMLOGIC_PAGE_TRACE=y
-CONFIG_AMLOGIC_SLAB_TRACE=y
-CONFIG_AMLOGIC_CMA=y
-CONFIG_AMLOGIC_VMAP=y
-CONFIG_AMLOGIC_MEM_DEBUG=y
-CONFIG_AMLOGIC_FILE_CACHE=y
-CONFIG_AMLOGIC_STACKPROTECTOR=y
-CONFIG_AMLOGIC_USER_FAULT=y
-CONFIG_AMLOGIC_WATCHPOINT=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_DMABUF_HEAPS_SYSTEM=m
-CONFIG_AMLOGIC_ZSTD=y
-CONFIG_DMA_RESTRICTED_POOL=n
-
-# debug builtin
-CONFIG_AMLOGIC_DEBUG=y
-CONFIG_AMLOGIC_DEBUG_LOCKUP=y
-CONFIG_AMLOGIC_DEBUG_ATRACE=y
-CONFIG_AMLOGIC_BOOT_TIME=y
-CONFIG_AMLOGIC_DEBUG_PRINTK=y
-CONFIG_AMLOGIC_DEBUG_FTRACE_PSTORE=y
-CONFIG_PSTORE_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_AMLOGIC_DEBUG_RELABEL=y
-CONFIG_AMLOGIC_DEBUG_RELABEL_GKI=n
-
-# amlogic-i2c.ko
-CONFIG_I2C_COMPAT=y
-
-# usb xxx ko
-CONFIG_AMLOGIC_COMMON_USB=y
-
-#cfg80211.ko
-CONFIG_NL80211_TESTMODE=y
-CONFIG_CFG80211_WEXT=y
-
-# v4l2 vendor hooks
-CONFIG_ANDROID_KABI_RESERVE=y
-CONFIG_AMLOGIC_V4L2=y
diff --git a/arch/arm64/configs/amlogic_gki.10 b/arch/arm64/configs/amlogic_gki.10
new file mode 100644
index 0000000..4c532ec
--- /dev/null
+++ b/arch/arm64/configs/amlogic_gki.10
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+# early console
+CONFIG_AMLOGIC_SERIAL_EARLY_CONSOLE=y
+
+# amlogic-i2c.ko
+CONFIG_I2C_COMPAT=y
diff --git a/arch/arm64/configs/amlogic_gki.debug b/arch/arm64/configs/amlogic_gki.debug
index 21bdd30..d6418d8 100644
--- a/arch/arm64/configs/amlogic_gki.debug
+++ b/arch/arm64/configs/amlogic_gki.debug
@@ -6,3 +6,44 @@
 
 CONFIG_AMLOGIC_DEBUG_FILE=y
 # ONFIG_AMLOGIC_SAMPLES_DEBUG_FILE_TEST=m
+
+# build in for amlogic memory change
+CONFIG_CMA_SIZE_MBYTES=8
+CONFIG_AMLOGIC_MEMORY_EXTEND=y
+CONFIG_AMLOGIC_PAGE_TRACE=y
+CONFIG_AMLOGIC_SLAB_TRACE=y
+CONFIG_AMLOGIC_CMA=y
+CONFIG_AMLOGIC_VMAP=y
+CONFIG_AMLOGIC_MEM_DEBUG=y
+CONFIG_AMLOGIC_FILE_CACHE=y
+CONFIG_AMLOGIC_STACKPROTECTOR=y
+CONFIG_AMLOGIC_USER_FAULT=y
+CONFIG_AMLOGIC_WATCHPOINT=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_DMABUF_HEAPS_SYSTEM=m
+CONFIG_AMLOGIC_ZSTD=y
+CONFIG_DMA_RESTRICTED_POOL=n
+
+# debug builtin
+CONFIG_AMLOGIC_DEBUG=y
+CONFIG_AMLOGIC_DEBUG_LOCKUP=y
+CONFIG_AMLOGIC_DEBUG_ATRACE=y
+CONFIG_AMLOGIC_BOOT_TIME=y
+CONFIG_AMLOGIC_DEBUG_PRINTK=y
+CONFIG_AMLOGIC_DEBUG_FTRACE_PSTORE=y
+CONFIG_AMLOGIC_DEBUG_SCRAMBLER_RAMOOPS=y
+CONFIG_PSTORE_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_AMLOGIC_DEBUG_RELABEL=y
+CONFIG_AMLOGIC_DEBUG_RELABEL_GKI=n
+
+# usb xxx ko
+CONFIG_AMLOGIC_COMMON_USB=y
+
+#cfg80211.ko
+CONFIG_NL80211_TESTMODE=y
+CONFIG_CFG80211_WEXT=y
+
+# v4l2 vendor hooks
+CONFIG_ANDROID_KABI_RESERVE=y
+CONFIG_AMLOGIC_V4L2=y
diff --git a/build.config.amlogic b/build.config.amlogic
index 02a59d3..af4a7da 100644
--- a/build.config.amlogic
+++ b/build.config.amlogic
@@ -28,10 +28,11 @@
 fi
 
 DEFCONFIG=amlogic_gki_defconfig
-GKI_BASE_CONFIG=${KERNEL_DIR}/arch/arm64/configs/gki_defconfig
-FRAGMENT_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/arm64/configs/amlogic_gki.fragment
-FRAGMENT_CONFIG_OPTIMIZE=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/arm64/configs/amlogic_gki.optimize
-FRAGMENT_CONFIG_DEBUG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/arm64/configs/amlogic_gki.debug
+GKI_BASE_CONFIG=${KERNEL_DIR}/arch/${ARCH}/configs/gki_defconfig
+KCONFIG_DEFCONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/${DEFCONFIG}
+FRAGMENT_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.fragment
+FRAGMENT_CONFIG_GKI10=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.10
+FRAGMENT_CONFIG_DEBUG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.debug
 
 PRE_DEFCONFIG_CMDS="pre_defconfig_cmds"
 POST_DEFCONFIG_CMDS="post_defconfig_cmds"
@@ -81,7 +82,7 @@
 "
 fi
 
-DTS_EXT_DIR=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/arm64/boot/dts/amlogic
+DTS_EXT_DIR=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/boot/dts/amlogic
 DTC_INCLUDE=${ROOT_DIR}/${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/include
 
 EXT_MODULES="
@@ -108,22 +109,22 @@
 EXTRA_CMDS="extra_cmds"
 
 
-if [[ ${GKI_CONFIG} == gki ]]; then
+if [[ ${GKI_CONFIG} == gki_20 ]]; then
 	ADDITIONAL_KMI_SYMBOL_LISTS="
 		${ADDITIONAL_KMI_SYMBOL_LISTS}
 		${COMMON_DRIVERS_DIR}/android/abi_gki_aarch64_amlogic
 	"
-elif [[ ${GKI_CONFIG} == gki_user ]]; then
+elif [[ ${GKI_CONFIG} == gki_10 ]]; then
 	ADDITIONAL_KMI_SYMBOL_LISTS="
 		${ADDITIONAL_KMI_SYMBOL_LISTS}
 		${COMMON_DRIVERS_DIR}/android/abi_gki_aarch64_amlogic
-		${COMMON_DRIVERS_DIR}/android/abi_gki_aarch64_amlogic.optimize
+		${COMMON_DRIVERS_DIR}/android/abi_gki_aarch64_amlogic.10
 	"
-elif [[ ${GKI_CONFIG} == gki_userdebug ]]; then
+elif [[ ${GKI_CONFIG} == gki_debug ]]; then
 	ADDITIONAL_KMI_SYMBOL_LISTS="
 		${ADDITIONAL_KMI_SYMBOL_LISTS}
 		${COMMON_DRIVERS_DIR}/android/abi_gki_aarch64_amlogic
-		${COMMON_DRIVERS_DIR}/android/abi_gki_aarch64_amlogic.optimize
+		${COMMON_DRIVERS_DIR}/android/abi_gki_aarch64_amlogic.10
 		${COMMON_DRIVERS_DIR}/android/abi_gki_aarch64_amlogic.debug
 	"
 fi
diff --git a/build.config.amlogic32 b/build.config.amlogic32
index 9431092..ce175d3 100644
--- a/build.config.amlogic32
+++ b/build.config.amlogic32
@@ -29,10 +29,10 @@
 fi
 
 DEFCONFIG=amlogic_gki_defconfig
-GKI_BASE_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/arm/configs/gki_defconfig
-
+GKI_BASE_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/gki_defconfig
+KCONFIG_DEFCONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/${DEFCONFIG}
 FRAGMENT_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.fragment
-FRAGMENT_CONFIG_OPTIMIZE=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.optimize
+FRAGMENT_CONFIG_GKI10=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.10
 FRAGMENT_CONFIG_DEBUG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.debug
 
 PRE_DEFCONFIG_CMDS="pre_defconfig_cmds"
@@ -81,7 +81,7 @@
 "
 fi
 
-DTS_EXT_DIR=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/arm/boot/dts/amlogic
+DTS_EXT_DIR=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/boot/dts/amlogic
 DTC_INCLUDE=${ROOT_DIR}/${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/include
 
 EXT_MODULES="
diff --git a/mk.sh b/mk.sh
index fe0260e..d045093 100755
--- a/mk.sh
+++ b/mk.sh
@@ -18,9 +18,9 @@
 	echo "  --check_defconfig       for check defconfig"
 	echo "  --modules_depend        for check modules depend"
 	echo "  --android_project       for android project build"
-	echo "  --gki"					for build gki kernel:           gki_defconfig + amlogic_gki.fragment
-	echo "  --gki_user"				for build gki user kernel:      gki_defconfig + amlogic_gki.fragment + amlogic_gki.optimize
-	echo "  --gki_userdebug"        for build gki userdebug kernel: gki_defconfig + amlogic_gki.fragment + amlogic_gki.optimize + amlogic_gki.debug
+	echo "  --gki_20"		for build gki 2.0 kernel:	gki_defconfig + amlogic_gki.fragment
+	echo "  --gki_10"		for build gki 1.0 kernel:	gki_defconfig + amlogic_gki.fragment + amlogic_gki.10
+	echo "  --gki_debug"        	for build gki debug kernel:	gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 + amlogic_gki.debug
 }
 
 VA=
@@ -97,16 +97,16 @@
 		VA=1
 		shift
 		;;
-	--gki)
-		GKI_CONFIG=gki
+	--gki_20)
+		GKI_CONFIG=gki_20
 		shift
 		;;
-	--gki_user)
-		GKI_CONFIG=gki_user
+	--gki_10)
+		GKI_CONFIG=gki_10
 		shift
 		;;
-	--gki_userdebug)
-		GKI_CONFIG=gki_userdebug
+	--gki_debug)
+		GKI_CONFIG=gki_debug
 		shift
 		;;
 	-h|--help)
@@ -190,7 +190,7 @@
 	RM_KERNEL_BUILD_VAR_FILE=1
 fi
 
-GKI_CONFIG=${GKI_CONFIG:-gki_userdebug}
+GKI_CONFIG=${GKI_CONFIG:-gki_debug}
 
 set -e
 export ABI BUILD_CONFIG LTO KMI_SYMBOL_LIST_STRICT_MODE CHECK_DEFCONFIG