diff options
author | jianlong.huang <jianlong.huang@starfivetech.com> | 2022-03-24 13:20:37 +0300 |
---|---|---|
committer | jianlong.huang <jianlong.huang@starfivetech.com> | 2022-03-24 13:20:37 +0300 |
commit | 508cdf1b04f24165a7be9c1463452e33faf7bcb0 (patch) | |
tree | 3022e847d05a7cee4da96ba6b8c4b176a8b8235f | |
parent | 721135b85d1b03961e846d9bf3af162843e9813b (diff) | |
parent | 16dbe397ce448b49ef13f6c1447e2d96c9ade390 (diff) | |
download | linux-508cdf1b04f24165a7be9c1463452e33faf7bcb0.tar.xz |
Merge branch 'CR_756_linuxconf_Andy.Hu' into 'visionfive-5.15.y-devel'SDK_v2.3.0
linux:defconfig: sync usdk conf/visionfive_defconfig to linux
See merge request jh7100/linux!7
-rw-r--r-- | arch/riscv/configs/visionfive_defconfig | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/arch/riscv/configs/visionfive_defconfig b/arch/riscv/configs/visionfive_defconfig index e7f71314cffa..c7b91fa0f523 100644 --- a/arch/riscv/configs/visionfive_defconfig +++ b/arch/riscv/configs/visionfive_defconfig @@ -30,11 +30,13 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_SOC_STARFIVE=y # CONFIG_RISCV_ERRATA_ALTERNATIVE is not set CONFIG_SMP=y -CONFIG_NR_CPUS=4 +CONFIG_NR_CPUS=2 # CONFIG_RISCV_SBI_V01 is not set CONFIG_JUMP_LABEL=y # CONFIG_STACKPROTECTOR is not set # CONFIG_GCC_PLUGINS is not set +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y CONFIG_BLK_WBT=y # CONFIG_BLK_DEBUG_FS is not set CONFIG_PARTITION_ADVANCED=y @@ -110,6 +112,7 @@ CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_16550A_VARIANTS is not set CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_DW=y +CONFIG_HW_RANDOM=y # CONFIG_DEVMEM is not set # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y @@ -137,18 +140,24 @@ CONFIG_CPU_THERMAL=y CONFIG_WATCHDOG=y CONFIG_STARFIVE_WATCHDOG=y CONFIG_MFD_TPS65086=y +# CONFIG_MEDIA_CEC_SUPPORT is not set +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_STARFIVE_VIN=y +CONFIG_VIN_SENSOR_IMX219=y CONFIG_DRM=y CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_STARFIVE=y CONFIG_FB=y # CONFIG_VGA_CONSOLE is not set -CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_DRIVERS is not set # CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set +CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_STARFIVE_PWMDAC=y CONFIG_SND_SIMPLE_CARD=y @@ -179,12 +188,12 @@ CONFIG_DMABUF_HEAPS_SYSTEM=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_PWM=y CONFIG_PWM_SIFIVE_PTC=y +CONFIG_PHY_M31_DPHY_RX0=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_BTRFS_FS=y CONFIG_BTRFS_FS_POSIX_ACL=y -# CONFIG_MANDATORY_FILE_LOCKING is not set # CONFIG_DNOTIFY is not set CONFIG_FANOTIFY=y CONFIG_AUTOFS_FS=y @@ -195,6 +204,7 @@ CONFIG_EXFAT_FS=y CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y +CONFIG_EFIVAR_FS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y @@ -223,3 +233,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_TRACE is not set # CONFIG_FTRACE is not set # CONFIG_RUNTIME_TESTING_MENU is not set +CONFIG_OF_CONFIGFS=y +CONFIG_OVERLAY_FS=y +CONFIG_OVERLAY_FS_INDEX=y +CONFIG_OVERLAY_FS_XINO_AUTO=y +CONFIG_OVERLAY_FS_METACOPY=y |