Skip to content

Commit 835a056

Browse files
committed
ARM: shmobile: defconfig: Refresh for v5.8-rc1
Refresh the defconfig for Renesas ARM boards: - Drop CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 (no longer needed since commit 39c3e30 ("ARM: 8984/1: Kconfig: set default ZBOOT_ROM_TEXT/BSS value to 0x0")), - Move CONFIG_MEDIA_SUBDRV_AUTOSELECT (moved in commit 1b80d36 ("media: Kconfig: move the position of sub-driver autoselection")), - Drop CONFIG_MEDIA_CONTROLLER=y and CONFIG_VIDEO_V4L2_SUBDEV_API=y (auto-enabled since commit 32a363d ("media: Kconfig files: use select for V4L2 subdevs and MC")), - Enable CONFIG_MEDIA_PLATFORM_SUPPORT (needed since commit 06b9364 ("media: Kconfig: add an option to filter in/out platform drivers")). Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent b3a9e3b commit 835a056

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

arch/arm/configs/shmobile_defconfig

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ CONFIG_SMP=y
1313
CONFIG_SCHED_MC=y
1414
CONFIG_NR_CPUS=8
1515
CONFIG_HIGHMEM=y
16-
CONFIG_ZBOOT_ROM_TEXT=0x0
17-
CONFIG_ZBOOT_ROM_BSS=0x0
1816
CONFIG_ARM_APPENDED_DTB=y
1917
CONFIG_KEXEC=y
2018
CONFIG_CPU_FREQ=y
@@ -109,16 +107,15 @@ CONFIG_REGULATOR_DA9210=y
109107
CONFIG_REGULATOR_GPIO=y
110108
CONFIG_REGULATOR_MAX8973=y
111109
CONFIG_MEDIA_SUPPORT=y
110+
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
112111
CONFIG_MEDIA_CAMERA_SUPPORT=y
113-
CONFIG_MEDIA_CONTROLLER=y
114-
CONFIG_VIDEO_V4L2_SUBDEV_API=y
112+
CONFIG_MEDIA_PLATFORM_SUPPORT=y
115113
CONFIG_V4L_PLATFORM_DRIVERS=y
116114
CONFIG_VIDEO_RCAR_VIN=y
117115
CONFIG_V4L_MEM2MEM_DRIVERS=y
118116
CONFIG_VIDEO_RENESAS_FDP1=y
119117
CONFIG_VIDEO_RENESAS_JPU=y
120118
CONFIG_VIDEO_RENESAS_VSP1=y
121-
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
122119
CONFIG_VIDEO_ADV7180=y
123120
CONFIG_VIDEO_ADV7604=y
124121
CONFIG_VIDEO_ML86V7667=y

0 commit comments

Comments
 (0)