[1/7] ARM: shmobile: defconfig: Refresh for v5.8-rc1

Commit Message

Geert Uytterhoeven June 24, 2020, 1:19 p.m. UTC

Refresh the defconfig for Renesas ARM boards:
  - Drop CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 (no longer
    needed since commit 39c3e304567a013a ("ARM: 8984/1: Kconfig: set
    default ZBOOT_ROM_TEXT/BSS value to 0x0")),
  - Move CONFIG_MEDIA_SUBDRV_AUTOSELECT (moved in commit
    1b80d36aeb92a767 ("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 32a363d0b0b142f3 ("media: Kconfig files:
    use select for V4L2 subdevs and MC")),
  - Enable CONFIG_MEDIA_PLATFORM_SUPPORT (needed since commit
    06b93644f4d102bd ("media: Kconfig: add an option to filter in/out
    platform drivers")).

Signed-off-by: Geert Uytterhoeven <[e-mail]>
---
 arch/arm/configs/shmobile_defconfig | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Patch

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 9cf3143025e1eea4..99ad932193268ce0 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -13,8 +13,6 @@  CONFIG_SMP=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=8
 CONFIG_HIGHMEM=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_KEXEC=y
 CONFIG_CPU_FREQ=y
@@ -109,16 +107,15 @@  CONFIG_REGULATOR_DA9210=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_MAX8973=y
 CONFIG_MEDIA_SUPPORT=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_RCAR_VIN=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_RENESAS_FDP1=y
 CONFIG_VIDEO_RENESAS_JPU=y
 CONFIG_VIDEO_RENESAS_VSP1=y
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 CONFIG_VIDEO_ADV7180=y
 CONFIG_VIDEO_ADV7604=y
 CONFIG_VIDEO_ML86V7667=y