From c0189b16313c4b9abd1ef534b1df0ad1981c8cf6 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 10 Feb 2021 09:39:56 -0800 Subject: [PATCH] ANDROID: amlogic: Use FRAGMENT_CONFIG ./build/config.sh provides Kbuild's configuration editor in kernel/build environment, plus support for editing config fragments. Set FRAGMENT_CONFIG for ./build/config.sh. Bug: 179406580 Signed-off-by: Kevin Hilman Change-Id: I76372284ba87b759b48bdda1a994cf7001d87395 --- build.config.amlogic | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.config.amlogic b/build.config.amlogic index bf67d36c4d3e..cd800c2ec5d4 100644 --- a/build.config.amlogic +++ b/build.config.amlogic @@ -1,7 +1,9 @@ . ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64 DEFCONFIG=amlogic_gki_defconfig -PRE_DEFCONFIG_CMDS="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}/${KERNEL_DIR}/arch/arm64/configs/amlogic_gki.fragment" +FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/amlogic_gki.fragment + +PRE_DEFCONFIG_CMDS="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}" POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}" # needed for DT overlay support