user: android R need build user [1/1]
PD#SWPL-131945
Problem:
android R need build user
fix DEBUG_FS use error
Solution:
disabled DEBUG_FS config when build user
Verify:
local
Test:
zcat /proc/config.gz |grep CONFIG_DEBUG_FS
Change-Id: I274d7e29d3c20a9b6f03bc306f8c9fa185b963c5
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index e490069..de29934 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -82,6 +82,10 @@
fi
done
fi
+
+ if [[ ${UPGRADE_PROJECT} == r || ${UPGRADE_PROJECT} == R ]] && [[ "${CONFIG_BOOTIMAGE}" == "user" ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${AMLOGIC_R_USER_DIFFCONFIG}
+ fi
}
export -f pre_defconfig_cmds
@@ -1297,12 +1301,14 @@
export ABI BUILD_CONFIG LTO KMI_SYMBOL_LIST_STRICT_MODE CHECK_DEFCONFIG MANUAL_INSMOD_MODULE ARCH
export KERNEL_DIR COMMON_DRIVERS_DIR BUILD_DIR ANDROID_PROJECT GKI_CONFIG UPGRADE_PROJECT ANDROID_VERSION FAST_BUILD CHECK_GKI_20 DEV_CONFIGS
export FULL_KERNEL_VERSION BAZEL PREBUILT_GKI KASAN
+ export AMLOGIC_R_USER_DIFFCONFIG=${ROOT_DIR}/${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_r_user_diff.fragment
echo ROOT_DIR=$ROOT_DIR
echo ABI=${ABI} BUILD_CONFIG=${BUILD_CONFIG} LTO=${LTO} KMI_SYMBOL_LIST_STRICT_MODE=${KMI_SYMBOL_LIST_STRICT_MODE} CHECK_DEFCONFIG=${CHECK_DEFCONFIG} MANUAL_INSMOD_MODULE=${MANUAL_INSMOD_MODULE}
echo KERNEL_DIR=${KERNEL_DIR} COMMON_DRIVERS_DIR=${COMMON_DRIVERS_DIR} BUILD_DIR=${BUILD_DIR} ANDROID_PROJECT=${ANDROID_PROJECT} GKI_CONFIG=${GKI_CONFIG} UPGRADE_PROJECT=${UPGRADE_PROJECT} ANDROID_VERSION=${ANDROID_VERSION} FAST_BUILD=${FAST_BUILD} CHECK_GKI_20=${CHECK_GKI_20}
echo FULL_KERNEL_VERSION=${FULL_KERNEL_VERSION} BAZEL=${BAZEL} PREBUILT_GKI=${PREBUILT_GKI} KASAN=${KASAN}
echo MENUCONFIG=${MENUCONFIG} BASICCONFIG=${BASICCONFIG} IMAGE=${IMAGE} MODULES=${MODULES} DTB_BUILD=${DTB_BUILD}
+ echo AMLOGIC_R_USER_DIFFCONFIG=${AMLOGIC_R_USER_DIFFCONFIG} CONFIG_BOOTIMAGE=${CONFIG_BOOTIMAGE}
}
export -f export_env_variable
diff --git a/arch/arm/configs/amlogic_r_user_diff.fragment b/arch/arm/configs/amlogic_r_user_diff.fragment
new file mode 100644
index 0000000..edf3516
--- /dev/null
+++ b/arch/arm/configs/amlogic_r_user_diff.fragment
@@ -0,0 +1,3 @@
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_PINNER is not set
+# CONFIG_DEBUG_FS is not set
diff --git a/arch/arm64/configs/amlogic_r_user_diff.fragment b/arch/arm64/configs/amlogic_r_user_diff.fragment
new file mode 100644
index 0000000..edf3516
--- /dev/null
+++ b/arch/arm64/configs/amlogic_r_user_diff.fragment
@@ -0,0 +1,3 @@
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_PINNER is not set
+# CONFIG_DEBUG_FS is not set
diff --git a/build.config.amlogic.bazel b/build.config.amlogic.bazel
index 8c3d1f9..80410af 100644
--- a/build.config.amlogic.bazel
+++ b/build.config.amlogic.bazel
@@ -65,6 +65,10 @@
done
fi
+ if [[ ${UPGRADE_PROJECT} == r || ${UPGRADE_PROJECT} == R ]] && [[ "${CONFIG_BOOTIMAGE}" == "user" ]]; then
+ KCONFIG_CONFIG=${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${KCONFIG_DEFCONFIG} ${AMLOGIC_R_USER_DIFFCONFIG}
+ fi
+
if [[ -n ${CHECK_GKI_20} ]]; then
echo > ${temp_file}
for configs in ${GKI_CHECK_CONFIG_WHITE_LIST}; do
diff --git a/build.config.amlogic.fragment.bazel b/build.config.amlogic.fragment.bazel
index 9de7316..7beff3e 100644
--- a/build.config.amlogic.fragment.bazel
+++ b/build.config.amlogic.fragment.bazel
@@ -78,6 +78,10 @@
${temp_file}
fi
+ if [[ ${UPGRADE_PROJECT} == r || ${UPGRADE_PROJECT} == R ]] && [[ "${CONFIG_BOOTIMAGE}" == "user" ]]; then
+ KCONFIG_CONFIG=${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${KCONFIG_DEFCONFIG} ${AMLOGIC_R_USER_DIFFCONFIG}
+ fi
+
if [[ -n ${CHECK_GKI_20} ]]; then
KCONFIG_CONFIG=${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r \
${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig
diff --git a/drivers/drm/meson_crtc.c b/drivers/drm/meson_crtc.c
index 276132a..3e935c7 100644
--- a/drivers/drm/meson_crtc.c
+++ b/drivers/drm/meson_crtc.c
@@ -493,8 +493,9 @@
static int meson_crtc_late_register(struct drm_crtc *crtc)
{
- if (IS_ENABLED(CONFIG_DEBUG_FS))
+#if IS_ENABLED(CONFIG_DEBUG_FS)
meson_crtc_debugfs_late_init(crtc);
+#endif
return 0;
}
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index a550900..948b641 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -4031,10 +4031,11 @@
#endif
#endif
+#if IS_ENABLED(CONFIG_DEBUG_FS)
if (mmc->debugfs_root && aml_card_type_mmc(host)) {
host->debugfs_root = debugfs_create_dir(dev_name(&pdev->dev), mmc->debugfs_root);
if (IS_ERR_OR_NULL(host->debugfs_root))
- goto err_bounce_buf;
+ pr_err("mmc debugfs creat failed\n");
debugfs_create_file("clktest", 0400, host->debugfs_root, mmc,
&mmc_clktest_fops);
@@ -4051,7 +4052,7 @@
debugfs_create_file("erase_count", 0400, host->debugfs_root,
mmc, &erase_count_fops);
}
-
+#endif
host->blk_test = devm_kzalloc(host->dev,
512 * CALI_BLK_CNT, GFP_KERNEL);