commit 5121781549e2570b2c62070310988458a469ee58
author Wanwei Jiang <wanwei.jiang@amlogic.com> Tue Nov 01 20:23:03 2022 +0800
committer qinglin.li <qinglin.li@amlogic.com> Sat Nov 05 12:06:23 2022 +0800
tree 6dfed0bfdec6eb60a229a6c339a3b6dbd32e7999
parent 0b2a96838a4f7d7b931d56ceef717ba64667ad81

fatload: can't enter console [1/1]

PD#SWPL-99379

Problem:
can't enter console

Solution:
1. set CONFIG_AMLOGIC_SERIAL_MESON=y when fatload
2. remove CONFIG_DEVTMPFS=y

Verify:
sc2

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

amlogic_utils.sh

diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index 1830f28..69862d6 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -6,12 +6,25 @@
 		export PATH=${PATH}:/usr/bin/
 	fi
 
-	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}
+	if [[ -z ${ANDROID_PROJECT} ]]; then
+		local temp_file=`mktemp /tmp/config.XXXXXXXXXXXX`
+		echo "CONFIG_AMLOGIC_SERIAL_MESON=y" > ${temp_file}
+		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
+			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
+		rm ${temp_file}
+	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}
+		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
 	fi
 }
 export -f pre_defconfig_cmds