commit 061c478f68b17e222099c99cf6cb2ea8125f8b26
author Dezhen Wang <dezhen.wang@amlogic.com> Thu May 25 11:13:08 2023 +0800
committer gerrit autosubmit <gerrit.autosubmit@amlogic.com> Thu May 25 04:08:13 2023 -0700
tree 85b94949d8bc8448af36c4179da4b3ccafeee306
parent a9e6eda088b78ab586a1680bf7d6ae3fae402e6d

Configs: add new config for android s with kernel 5.15 [1/1]

PD#SWPL-124507

Problem:
android s with kernel 5.15 have not config.

Solution:
add new config for android s with kernel 5.15

Verify:
local

Change-Id: I191ecd9724d4fc9f983d31728685ed7112cf5482
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>

amlogic_utils.sh

diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index 77c6a2f..17a61b4 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -36,10 +36,15 @@
 	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}
+		if [[ ${ANDROID_VERSION} == r || ${ANDROID_VERSION} == R ]]; 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_R}
+		fi
 		if [[ ${ANDROID_VERSION} == p || ${ANDROID_VERSION} == P ]]; 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_P}
 		fi
+		if [[ ${ANDROID_VERSION} == s || ${ANDROID_VERSION} == S ]]; 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_S}
+		fi
 	fi
 
 	if [[ ${IN_BUILD_GKI_10} == 1 ]]; then