From 882f5bc13dfcc8c9489fc2ca15a742acc1cc75c2 Mon Sep 17 00:00:00 2001
From: Weiwen Chen <cww@rock-chips.com>
Date: Wed, 18 Nov 2020 18:03:59 +0800
Subject: [PATCH] ARM: configs: rv1126-spi-nor.config: enable isp/mpp/sound
 built-in

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I0cc9b8af989bde9a3f776c204eb96f58b3514d5a
---
 arch/arm/configs/rv1126-spi-nor.config | 55 +++-----------------------
 1 file changed, 6 insertions(+), 49 deletions(-)

diff --git a/arch/arm/configs/rv1126-spi-nor.config b/arch/arm/configs/rv1126-spi-nor.config
index f9d8b2cc4306..21b7a18b9931 100644
--- a/arch/arm/configs/rv1126-spi-nor.config
+++ b/arch/arm/configs/rv1126-spi-nor.config
@@ -9,9 +9,8 @@ CONFIG_BT_HCIUART=m
 CONFIG_CFG80211=m
 CONFIG_COMMON_CLK_PROCFS=y
 CONFIG_DNS_RESOLVER=y
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_ROCKCHIP=m
 CONFIG_DW_WATCHDOG=m
+# CONFIG_EXT4_FS is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_JFFS2_FS=y
 # CONFIG_KERNEL_LZ4 is not set
@@ -30,44 +29,18 @@ CONFIG_MTD_UBI=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_OVERLAY_FS=m
 # CONFIG_PERF_EVENTS is not set
-CONFIG_PHY_ROCKCHIP_MIPI_RX=m
 CONFIG_PHY_ROCKCHIP_NANENG_USB2=m
 CONFIG_RFKILL=m
 CONFIG_RFKILL_RK=m
 # CONFIG_RK_SFC_NAND is not set
 # CONFIG_ROCKCHIP_DW_MIPI_DSI is not set
-CONFIG_ROCKCHIP_MPP_IEP2=m
-CONFIG_ROCKCHIP_MPP_RKVDEC=m
-CONFIG_ROCKCHIP_MPP_RKVENC=m
-CONFIG_ROCKCHIP_MPP_SERVICE=m
-CONFIG_ROCKCHIP_MPP_VDPU2=m
-CONFIG_ROCKCHIP_MPP_VEPU2=m
 # CONFIG_ROCKCHIP_RGB is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_RK808=m
 CONFIG_SCSI=m
 CONFIG_SCSI_MOD=m
 # CONFIG_SLUB_SYSFS is not set
-CONFIG_SND=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_DUMMY_CODEC=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-CONFIG_SND_SOC_RK817=m
-CONFIG_SND_SOC_ROCKCHIP=m
-CONFIG_SND_SOC_ROCKCHIP_I2S=m
-CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
-CONFIG_SND_SOC_ROCKCHIP_PDM=m
-CONFIG_SND_SOC_WM8974=m
-CONFIG_SND_TIMER=m
-CONFIG_SOUND=m
 # CONFIG_SQUASHFS_LZ4 is not set
-CONFIG_SQUASHFS_XZ=y
 # CONFIG_SWAP is not set
 # CONFIG_TEE is not set
 # CONFIG_UBIFS_FS is not set
@@ -88,23 +61,15 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_STORAGE=m
 CONFIG_USB_XHCI_HCD=m
 CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_VMALLOC=m
 # CONFIG_VIDEO_GC4C33 is not set
 # CONFIG_VIDEO_IMX347 is not set
-CONFIG_VIDEO_IMX415=m
-CONFIG_VIDEO_OS04A10=m
+# CONFIG_VIDEO_IMX378 is not set
 # CONFIG_VIDEO_OV4689 is not set
-CONFIG_VIDEO_RK_IRCUT=m
-CONFIG_VIDEO_ROCKCHIP_CIF=m
-CONFIG_VIDEO_ROCKCHIP_ISP=m
-CONFIG_VIDEO_ROCKCHIP_ISPP=m
 CONFIG_WL_ROCKCHIP=m
-CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_X86 is not set
 # CONFIG_AFS_FS is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CIFS is not set
@@ -144,12 +109,4 @@ CONFIG_SUNRPC_GSS=y
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
 # CONFIG_V4L2_FLASH_LED_CLASS is not set
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_SPARC=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_XZ_DEC_X86=y
 CONFIG_ZLIB_DEFLATE=y