From 735784e0ea206b8e0ef005db300d4e86b9439acd Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Thu, 5 Mar 2020 19:08:50 +0800 Subject: [PATCH] ARM: rockchip_defconfig: update by savedefconfig Reorder some configs. Change-Id: Ibdd8c5225932d1418de3a108819a1bc9ad550bd8 Signed-off-by: Tao Huang --- arch/arm/configs/rockchip_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index 04fc4a57e068..8284b85feba2 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -465,12 +465,12 @@ CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ROCKCHIP_CIF=y CONFIG_VIDEO_ROCKCHIP_ISP1=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set +CONFIG_VIDEO_VM149C=y CONFIG_VIDEO_OV13850=y CONFIG_VIDEO_GC0312=y CONFIG_VIDEO_GC0329=y CONFIG_VIDEO_GC2035=y CONFIG_VIDEO_GC2145=y -CONFIG_VIDEO_VM149C=y CONFIG_VIDEO_SGM3784=y CONFIG_DRM=y CONFIG_DRM_IGNORE_IOTCL_PERMIT=y @@ -511,7 +511,6 @@ CONFIG_ROCKCHIP_MPP_VDPU1=y CONFIG_ROCKCHIP_MPP_VEPU1=y CONFIG_ROCKCHIP_MPP_VDPU2=y CONFIG_ROCKCHIP_MPP_VEPU2=y -CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set @@ -605,12 +604,12 @@ CONFIG_ANDROID_VERSION=0x08000000 CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y CONFIG_ROCKCHIP_SUSPEND_MODE=y +CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y CONFIG_PM_DEVFREQ=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_USERSPACE=y CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=y -CONFIG_PM_DEVFREQ_EVENT=y CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP=y CONFIG_IIO=y CONFIG_IIO_BUFFER=y