diff options
| author | Andy Hu <andy.hu@starfivetech.com> | 2023-08-22 16:24:46 +0300 |
|---|---|---|
| committer | Andy Hu <andy.hu@starfivetech.com> | 2023-08-22 16:24:46 +0300 |
| commit | 0a64960eaca8693fba232ab01c10a730c3a008f4 (patch) | |
| tree | 827183c83322730b725c28f6afaeb03cf7a01ec6 /arch | |
| parent | 10b79a67b5da4eb689c03324075d4dd547dc0683 (diff) | |
| parent | 33ffd33d08f5cb6dbf3598634f40735c21035c8b (diff) | |
| download | linux-0a64960eaca8693fba232ab01c10a730c3a008f4.tar.xz | |
Merge tag 'JH7110_515_SDK_v5.6.1' into vf2-515-devel
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/riscv/configs/starfive_jh7110_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/riscv/configs/starfive_jh7110_defconfig b/arch/riscv/configs/starfive_jh7110_defconfig index fae319468d53..09ea78f4d188 100644 --- a/arch/riscv/configs/starfive_jh7110_defconfig +++ b/arch/riscv/configs/starfive_jh7110_defconfig @@ -206,9 +206,9 @@ CONFIG_VIDEO_STF_VIN=y CONFIG_VIN_SENSOR_SC2235=y CONFIG_VIN_SENSOR_OV4689=y CONFIG_VIN_SENSOR_IMX219=y -CONFIG_VIDEO_IMX708=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_WAVE_VPU=m +CONFIG_VIDEO_IMX708=y CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_VERISILICON=y CONFIG_STARFIVE_INNO_HDMI=y @@ -329,7 +329,6 @@ CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_RWSEMS=y -CONFIG_DEBUG_ATOMIC_SLEEP=y CONFIG_STACKTRACE=y CONFIG_DEBUG_LIST=y CONFIG_DEBUG_PLIST=y |