commit 2853aa5224fa249e377d6e5f22acb1dc9dc3a446
author Lei Zhang <lei.zhang@amlogic.com> Tue Aug 23 09:40:06 2022 +0800
committer Wanwei Jiang <wanwei.jiang@amlogic.com> Wed Sep 07 20:06:44 2022 +0800
tree d713b5dec402854b8741723036378a59c2439cf8
parent 4ea4809eb67481a6cd84ee80da2cb0be5366a3f1

aarch32: bring up sc2 for aarch32 [1/1]

PD#SWPL-90403

Problem:
bring up sc2 for aarch32

Solution:
bring up sc2 for aarch32

Verify:
on SC2

Signed-off-by: Lei Zhang <lei.zhang@amlogic.com>
Change-Id: I1ff3e3854357c9ed56b4b2e8f4dfb9c67cc09500

amlogic_utils.sh

diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index 03d89c5..4aac281 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -2,13 +2,16 @@
 
 function pre_defconfig_cmds() {
 	export OUT_AMLOGIC_DIR=$(readlink -m ${COMMON_OUT_DIR}/amlogic)
+	if [ "${ARCH}" = "arm" ]; then
+		export PATH=${PATH}:/usr/bin/
+	fi
 
 	if [[ ${GKI_CONFIG} == gki ]]; then
-		KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}
+		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/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_OPTIMIZE}
+		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/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_OPTIMIZE} ${ROOT_DIR}/${FRAGMENT_CONFIG_DEBUG}
+		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}
 	fi
 }
 export -f pre_defconfig_cmds
@@ -17,7 +20,7 @@
 	if [[ ${CHECK_DEFCONFIG} -eq "1" ]]; then
 		check_defconfig
 	fi
-	rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}
+	rm ${ROOT_DIR}/${KERNEL_DIR}/arch/${ARCH}/configs/${DEFCONFIG}
 }
 export -f post_defconfig_cmds