From cb54e2b40667af90ddebe04478cc9463e7b654c3 Mon Sep 17 00:00:00 2001 From: Jianlong Wang Date: Tue, 7 Feb 2023 15:11:34 +0800 Subject: [PATCH] arm64: configs: px30_linux_defconfig: enable CONFIG_PSTORE Signed-off-by: Jianlong Wang Change-Id: I00d69aefef747372dcbb42d85638db6189646f05 --- arch/arm64/configs/px30_linux_defconfig | 5 ++--- arch/arm64/configs/rk3326_linux.config | 17 ++--------------- arch/arm64/configs/rk3358_linux.config | 13 +++++++++++++ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/arch/arm64/configs/px30_linux_defconfig b/arch/arm64/configs/px30_linux_defconfig index b71b414278b7..d3b7a7fafe62 100644 --- a/arch/arm64/configs/px30_linux_defconfig +++ b/arch/arm64/configs/px30_linux_defconfig @@ -365,9 +365,6 @@ CONFIG_ARM_ROCKCHIP_DMC_DEBUG=y CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP=y CONFIG_MEMORY=y CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_KFIFO_BUF=y -CONFIG_IIO_TRIGGER=y CONFIG_ROCKCHIP_SARADC=y CONFIG_SENSORS_ISL29018=y CONFIG_SENSORS_TSL2563=y @@ -403,6 +400,8 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_SQUASHFS=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_PMSG=y +CONFIG_PSTORE_FTRACE=y CONFIG_PSTORE_RAM=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y diff --git a/arch/arm64/configs/rk3326_linux.config b/arch/arm64/configs/rk3326_linux.config index 02bdbcad5d96..51e7dcad76c0 100644 --- a/arch/arm64/configs/rk3326_linux.config +++ b/arch/arm64/configs/rk3326_linux.config @@ -1,26 +1,13 @@ # CONFIG_ETHERNET is not set CONFIG_MD=y -CONFIG_PSTORE=y # CONFIG_ROCKCHIP_ANALOGIX_DP is not set -CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS=y -CONFIG_SND_SOC_ROCKCHIP_PDM=y -CONFIG_USB_CONFIGFS_F_MTP=y CONFIG_VIDEO_GC2155=y CONFIG_VIDEO_ROCKCHIP_CIF=y # CONFIG_BCACHE is not set # CONFIG_BLK_DEV_DM is not set # CONFIG_BLK_DEV_MD is not set -# CONFIG_DPM_WATCHDOG is not set -CONFIG_PSTORE_CONSOLE=y -# CONFIG_PSTORE_FTRACE is not set -# CONFIG_PSTORE_PMSG is not set -CONFIG_PSTORE_RAM=y -CONFIG_REED_SOLOMON=y -CONFIG_REED_SOLOMON_DEC8=y -CONFIG_REED_SOLOMON_ENC8=y +CONFIG_ROCKCHIP_CIF_USE_DUMMY_BUF=y +# CONFIG_ROCKCHIP_CIF_USE_NONE_DUMMY_BUF is not set # CONFIG_ROCKCHIP_CIF_WORKMODE_ONEFRAME is not set CONFIG_ROCKCHIP_CIF_WORKMODE_PINGPONG=y -# CONFIG_USB_CONFIGFS_F_PTP is not set -CONFIG_USB_F_MTP=y -CONFIG_ZLIB_DEFLATE=y diff --git a/arch/arm64/configs/rk3358_linux.config b/arch/arm64/configs/rk3358_linux.config index 4be7a7cfe0ac..5884a7b58987 100644 --- a/arch/arm64/configs/rk3358_linux.config +++ b/arch/arm64/configs/rk3358_linux.config @@ -1,2 +1,15 @@ +# CONFIG_ETHERNET is not set CONFIG_LTE=y +CONFIG_MD=y +# CONFIG_ROCKCHIP_ANALOGIX_DP is not set +CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS=y +CONFIG_VIDEO_GC2155=y +CONFIG_VIDEO_ROCKCHIP_CIF=y +# CONFIG_BCACHE is not set +# CONFIG_BLK_DEV_DM is not set +# CONFIG_BLK_DEV_MD is not set CONFIG_LTE_RM310=y +CONFIG_ROCKCHIP_CIF_USE_DUMMY_BUF=y +# CONFIG_ROCKCHIP_CIF_USE_NONE_DUMMY_BUF is not set +# CONFIG_ROCKCHIP_CIF_WORKMODE_ONEFRAME is not set +CONFIG_ROCKCHIP_CIF_WORKMODE_PINGPONG=y