diff --git a/arch/arm/configs/rk3126_linux.config b/arch/arm/configs/rk3126_linux.config index 52f5022f6845..8720e2206048 100644 --- a/arch/arm/configs/rk3126_linux.config +++ b/arch/arm/configs/rk3126_linux.config @@ -47,7 +47,6 @@ CONFIG_DEBUG_GPIO=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DNS_RESOLVER is not set -# CONFIG_DRM_IGNORE_IOTCL_PERMIT is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set # CONFIG_ECRYPT_FS is not set # CONFIG_ETHERNET is not set @@ -227,7 +226,9 @@ CONFIG_GS_MMA7660=y # CONFIG_GS_SC7A30 is not set # CONFIG_GYROSCOPE_DEVICE is not set # CONFIG_HALL_DEVICE is not set +# CONFIG_IAM20680_ACC is not set # CONFIG_ICM2060X_ACC is not set +# CONFIG_ICM4260X_ACC is not set CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y diff --git a/arch/arm/configs/rk3126_linux_slc_nand.config b/arch/arm/configs/rk3126_linux_slc_nand.config index 3b427c2c35b8..2fb867caf12a 100644 --- a/arch/arm/configs/rk3126_linux_slc_nand.config +++ b/arch/arm/configs/rk3126_linux_slc_nand.config @@ -46,7 +46,6 @@ CONFIG_DEBUG_GPIO=y # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DNS_RESOLVER is not set -# CONFIG_DRM_IGNORE_IOTCL_PERMIT is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set # CONFIG_ECRYPT_FS is not set # CONFIG_ETHERNET is not set @@ -232,7 +231,9 @@ CONFIG_GS_MMA7660=y # CONFIG_GS_SC7A30 is not set # CONFIG_GYROSCOPE_DEVICE is not set # CONFIG_HALL_DEVICE is not set +# CONFIG_IAM20680_ACC is not set # CONFIG_ICM2060X_ACC is not set +# CONFIG_ICM4260X_ACC is not set # CONFIG_INFTL is not set CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y diff --git a/arch/arm/configs/rk3128_linux.config b/arch/arm/configs/rk3128_linux.config index d93cbab25c46..f953797fd9a6 100644 --- a/arch/arm/configs/rk3128_linux.config +++ b/arch/arm/configs/rk3128_linux.config @@ -24,7 +24,6 @@ CONFIG_DEBUG_GPIO=y # CONFIG_DEBUG_LIST is not set CONFIG_DETECT_HUNG_TASK=y # CONFIG_DNS_RESOLVER is not set -# CONFIG_DRM_IGNORE_IOTCL_PERMIT is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set CONFIG_DRM_UDL=y # CONFIG_ECRYPT_FS is not set @@ -56,8 +55,6 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_SCHED_STACK_END_CHECK is not set CONFIG_SENSOR_DEVICE=y # CONFIG_SERIAL_OF_PLATFORM is not set -CONFIG_SND_SOC_ROCKCHIP_HDMI=y -CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_SPI_SPIDEV is not set # CONFIG_TEE is not set @@ -110,7 +107,9 @@ CONFIG_GS_MMA7660=y # CONFIG_GS_SC7A30 is not set # CONFIG_GYROSCOPE_DEVICE is not set # CONFIG_HALL_DEVICE is not set +# CONFIG_IAM20680_ACC is not set # CONFIG_ICM2060X_ACC is not set +# CONFIG_ICM4260X_ACC is not set # CONFIG_INTERVAL_TREE_TEST is not set CONFIG_IPC_NS=y # CONFIG_LIGHT_DEVICE is not set diff --git a/arch/arm/configs/rk3128_linux_spi_nand.config b/arch/arm/configs/rk3128_linux_spi_nand.config index 753c62855a61..4e257f023133 100644 --- a/arch/arm/configs/rk3128_linux_spi_nand.config +++ b/arch/arm/configs/rk3128_linux_spi_nand.config @@ -24,7 +24,6 @@ CONFIG_DEBUG_GPIO=y # CONFIG_DEBUG_LIST is not set CONFIG_DETECT_HUNG_TASK=y # CONFIG_DNS_RESOLVER is not set -# CONFIG_DRM_IGNORE_IOTCL_PERMIT is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set CONFIG_DRM_UDL=y # CONFIG_ECRYPT_FS is not set @@ -59,7 +58,6 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_SCHED_STACK_END_CHECK is not set CONFIG_SENSOR_DEVICE=y # CONFIG_SERIAL_OF_PLATFORM is not set -CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_SPI_SPIDEV is not set # CONFIG_TEE is not set @@ -112,7 +110,9 @@ CONFIG_GS_MMA7660=y # CONFIG_GS_SC7A30 is not set # CONFIG_GYROSCOPE_DEVICE is not set # CONFIG_HALL_DEVICE is not set +# CONFIG_IAM20680_ACC is not set # CONFIG_ICM2060X_ACC is not set +# CONFIG_ICM4260X_ACC is not set # CONFIG_INTERVAL_TREE_TEST is not set CONFIG_IPC_NS=y # CONFIG_LIGHT_DEVICE is not set @@ -134,6 +134,7 @@ CONFIG_RK_SFC_NOR=y CONFIG_RK_SFTL=y CONFIG_ROCKCHIP_FLASH_VENDOR_STORAGE=y # CONFIG_ROCKCHIP_MMC_VENDOR_STORAGE is not set +# CONFIG_ROCKCHIP_RAM_VENDOR_STORAGE is not set # CONFIG_ROCKCHIP_RGA2 is not set # CONFIG_STK8BAXX_ACC is not set # CONFIG_TEMPERATURE_DEVICE is not set