From 6104a6618d3678cd0a806201c17d950ca0a3012a Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Fri, 7 Aug 2020 14:27:21 +0800 Subject: [PATCH] ARM: configs: rv1126-spi-nor.config: Update by diffconfig Change-Id: I1ea10d8cedafc7ac6d94a362b9d62a6b57fc4596 Signed-off-by: Tao Huang --- arch/arm/configs/rv1126-spi-nor.config | 96 +++++++++++++++++--------- 1 file changed, 63 insertions(+), 33 deletions(-) diff --git a/arch/arm/configs/rv1126-spi-nor.config b/arch/arm/configs/rv1126-spi-nor.config index a951fb9b0fcb..4ce7c98c14f0 100644 --- a/arch/arm/configs/rv1126-spi-nor.config +++ b/arch/arm/configs/rv1126-spi-nor.config @@ -1,17 +1,15 @@ # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_BLK_DEV_BSG is not set CONFIG_BLK_DEV_SD=m -# CONFIG_BT_BREDR is not set -# CONFIG_BT_LE is not set CONFIG_BT=m +# CONFIG_BT_BREDR is not set CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_LE is not set CONFIG_CFG80211=m # CONFIG_DEBUG_FS is not set -CONFIG_DRM_ANALOGIX_DP=m +CONFIG_DNS_RESOLVER=y CONFIG_DRM_KMS_HELPER=m -CONFIG_DRM_PANEL_SIMPLE=m -CONFIG_DRM_PANEL_SIMPLE_OF_ONLY=m CONFIG_DRM_ROCKCHIP=m CONFIG_DW_WATCHDOG=m # CONFIG_INPUT_TOUCHSCREEN is not set @@ -21,15 +19,20 @@ CONFIG_KERNEL_XZ=y CONFIG_KEYBOARD_ADC=m CONFIG_KEYBOARD_GPIO=m # CONFIG_LEDS_TRIGGERS is not set +CONFIG_MAC80211=m +CONFIG_MMC_DW=m +CONFIG_MMC_DW_PLTFM=m +CONFIG_MMC_DW_ROCKCHIP=m CONFIG_MTD_BLOCK=y 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_RK_SFC_NAND_MTD is not set # CONFIG_ROCKCHIP_DW_MIPI_DSI is not set # CONFIG_ROCKCHIP_MPP_IEP2 is not set CONFIG_ROCKCHIP_MPP_RKVDEC=m @@ -40,27 +43,31 @@ CONFIG_ROCKCHIP_MPP_VEPU2=m # CONFIG_ROCKCHIP_RGB is not set 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=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=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=m CONFIG_SND_SOC_ROCKCHIP_PDM=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 +CONFIG_USB=m # CONFIG_USB_CONFIGFS_F_UAC1 is not set # CONFIG_USB_CONFIGFS_F_UAC2 is not set # CONFIG_USB_CONFIGFS_F_UVC is not set @@ -71,45 +78,68 @@ CONFIG_USB_DWC3_OF_SIMPLE=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_HID=m -# CONFIG_USB_KBD is not set -CONFIG_USB=m -# CONFIG_USB_MOUSE is not set CONFIG_USB_NET_DRIVERS=m CONFIG_USB_OHCI_HCD=m 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_OS04A10=m CONFIG_VIDEO_IMX415=m +CONFIG_VIDEO_OS04A10=m # CONFIG_VIDEO_OV4689 is not set CONFIG_VIDEO_RK_IRCUT=m +# CONFIG_VIDEO_ROCKCHIP_CIF is not set CONFIG_VIDEO_ROCKCHIP_ISP=m CONFIG_VIDEO_ROCKCHIP_ISPP=m -# CONFIG_VIDEO_ROCKCHIP_CIF is not set CONFIG_WL_ROCKCHIP=m -# CONFIG_SQUASHFS_XATTR is not set -# CONFIG_SQUASHFS_ZLIB is not set -# CONFIG_SQUASHFS_LZ4 is not set -# CONFIG_SQUASHFS_LZO is not set -CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_ZSTD is not set -CONFIG_MMC_DW=m -CONFIG_MMC_DW_PLTFM=m -# CONFIG_MMC_DW_BLUEFIELD is not set -# CONFIG_MMC_DW_EXYNOS is not set -# CONFIG_MMC_DW_HI3798CV200 is not set -# CONFIG_MMC_DW_K3 is not set -CONFIG_MMC_DW_ROCKCHIP=m -CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_XZ_DEC=y +# CONFIG_AFS_FS is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_CODA_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_GRACE_PERIOD=y +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_FS_DEBUG=0 +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_XATTR is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_SUMMARY is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_MTD_BLKDEVS=y +# CONFIG_NFSD is not set +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y CONFIG_NFS_FS=y +CONFIG_NFS_USE_KERNEL_DNS=y +# CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_V2=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -CONFIG_NFS_SWAP=y -CONFIG_NFS_USE_KERNEL_DNS=y -CONFIG_NFS_ACL_SUPPORT=y -CONFIG_NFS_COMMON=y +# CONFIG_NFS_V4_1 is not set +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_DEBUG is not set +CONFIG_SUNRPC_GSS=y +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE 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