commit 132653e33fcad23130d78157943b3755fcf54496
author Dezhen Wang <dezhen.wang@amlogic.com> Thu Oct 24 06:29:43 2024 +0000
committer gerrit autosubmit <gerrit.autosubmit@amlogic.com> Sun Nov 24 22:22:42 2024 -0800
tree d51f7e09ccdf3816790be4ff3c47544d700f6312
parent 21924f1a8885ce867ea07396e46933b76f836b59

scripts: Combine the configs of r/s/u upgrade projects into one [1/1]

PD#SWPL-188813

Problem:
It is unnecessary to maintain a separate config for each upgrade
p/s/u project.

Solution:
Combine the configs of r/s/u upgrade projects into one

Verify:
local

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

amlogic_utils.sh

diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index 6b6dcef..034706f 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -48,18 +48,12 @@
 		fi
 	fi
 
-	if [[ ${UPGRADE_PROJECT} == r || ${UPGRADE_PROJECT} == 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}
+	if [[ ${UPGRADE_PROJECT} == r || ${UPGRADE_PROJECT} == R || ${UPGRADE_PROJECT} == s || ${UPGRADE_PROJECT} == S || ${UPGRADE_PROJECT} == u || ${UPGRADE_PROJECT} == U ]]; 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
 	if [[ ${UPGRADE_PROJECT} == p || ${UPGRADE_PROJECT} == 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 [[ ${UPGRADE_PROJECT} == s || ${UPGRADE_PROJECT} == 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
-	if [[ ${UPGRADE_PROJECT} == u || ${UPGRADE_PROJECT} == U ]]; 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_U}
-	fi
 
 	if [[ ${IN_BUILD_GKI_10} == 1 ]]; then
 		local temp_file=`mktemp /tmp/config.XXXXXXXXXXXX`