diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index 4ecc3d7203b0..78119b19d627 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -24,7 +24,6 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_BPF=y CONFIG_NAMESPACES=y # CONFIG_PID_NS is not set -CONFIG_SCHED_TUNE=y CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set @@ -95,7 +94,6 @@ CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_GHASH_ARM64_CE=y -CONFIG_CRYPTO_CRC32_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_JUMP_LABEL=y @@ -287,10 +285,8 @@ CONFIG_DM_DEFAULT_KEY=y CONFIG_DM_SNAPSHOT=y CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y -CONFIG_DM_VERITY_AVB=y CONFIG_DM_VERITY_FEC=y CONFIG_DM_BOW=y -CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_TUN=y @@ -516,8 +512,8 @@ CONFIG_GPIO_SYSFS=y CONFIG_POWER_RESET_GPIO=y CONFIG_SYSCON_REBOOT_MODE=y CONFIG_TEST_POWER=y -CONFIG_CHARGER_BQ25700=y CONFIG_BATTERY_CW2015=y +CONFIG_CHARGER_BQ25700=y CONFIG_BATTERY_RK817=y CONFIG_CHARGER_RK817=y CONFIG_BATTERY_RK818=y @@ -815,7 +811,6 @@ CONFIG_RK_CONSOLE_THREAD=y CONFIG_POWERVR_ROGUE_N=y CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_SCMI=y -# CONFIG_COMMON_CLK_XGENE is not set CONFIG_COMMON_CLK_PWM=y CONFIG_MAILBOX=y CONFIG_RK3368_MBOX=y @@ -826,7 +821,6 @@ CONFIG_CPU_RK3328=y CONFIG_CPU_RK3368=y CONFIG_CPU_RK3399=y CONFIG_CPU_RK3568=y -CONFIG_ANDROID_VERSION=0x08000000 CONFIG_ROCKCHIP_CPUINFO=y CONFIG_ROCKCHIP_GRF=y CONFIG_ROCKCHIP_IODOMAIN=y @@ -849,10 +843,7 @@ CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ=y CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=y CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP=y CONFIG_IIO=y -CONFIG_IIO_BUFFER=y CONFIG_IIO_BUFFER_CB=y -CONFIG_IIO_KFIFO_BUF=y -CONFIG_IIO_TRIGGER=y CONFIG_ROCKCHIP_SARADC=y CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y @@ -881,10 +872,8 @@ CONFIG_RK_HEADSET=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y -CONFIG_EXT4_ENCRYPTION=y CONFIG_F2FS_FS=y CONFIG_F2FS_FS_SECURITY=y -CONFIG_F2FS_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION=y CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y CONFIG_FS_VERITY=y @@ -917,7 +906,6 @@ CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y CONFIG_UNICODE=y -CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_LSM_MMAP_MIN_ADDR=4096