Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25cee71a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-defconfig-for-v4.20' of... 

Merge tag 'renesas-arm-defconfig-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Renesas ARM Based SoC Defconfig Updates for v4.20

* shmobile and multi_v7 defconfigs:
  - Enable recently upstreamed r8a7744 SoC
  - Enable FDP1 (Fine Display processor) present on R-Car Gen2 and RZ/G1 SoCs
* shmobile defconfig (only):
  - Refresh for v4.19-rc1
  - Remove soon to be deprecated SOC_CAMERA

* tag 'renesas-arm-defconfig-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: defconfig: Enable r8a7744 SoC
  ARM: multi_v7_defconfig: Enable r8a7744 SoC
  ARM: multi_v7_defconfig: Enable VIDEO_RENESAS_FDP1
  ARM: shmobile: defconfig: Enable VIDEO_RENESAS_FDP1
  ARM: shmobile: defconfig: Refresh shmobile_defconfig for v4.19-rc1
  ARM: shmobile: defconfig: Remove SOC_CAMERA

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d314e6e2 c26eb6f3

arch/arm/configs/multi_v7_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ CONFIG_ARCH_R7S72100=y 
CONFIG_ARCH_R8A73A4=y

CONFIG_ARCH_R8A7740=y

CONFIG_ARCH_R8A7743=y

CONFIG_ARCH_R8A7744=y

CONFIG_ARCH_R8A7745=y

CONFIG_ARCH_R8A77470=y

CONFIG_ARCH_R8A7778=y
@@ -586,6 +587,7 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m 
CONFIG_VIDEO_STI_BDISP=m

CONFIG_VIDEO_STI_HVA=m

CONFIG_VIDEO_STI_DELTA=m

CONFIG_VIDEO_RENESAS_FDP1=m

CONFIG_VIDEO_RENESAS_JPU=m

CONFIG_VIDEO_RENESAS_VSP1=m

CONFIG_V4L_TEST_DRIVERS=y

arch/arm/configs/shmobile_defconfig

+3 −5
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ CONFIG_ARCH_R7S72100=y 
CONFIG_ARCH_R8A73A4=y

CONFIG_ARCH_R8A7740=y

CONFIG_ARCH_R8A7743=y

CONFIG_ARCH_R8A7744=y

CONFIG_ARCH_R8A7745=y

CONFIG_ARCH_R8A77470=y

CONFIG_ARCH_R8A7778=y
@@ -32,10 +33,8 @@ CONFIG_PCI_RCAR_GEN2=y 
CONFIG_PCIE_RCAR=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_HAVE_ARM_ARCH_TIMER=y

CONFIG_NR_CPUS=8

CONFIG_HIGHMEM=y

CONFIG_CMA=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y
@@ -50,6 +49,7 @@ CONFIG_CPUFREQ_DT=y 
CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_CMA=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -129,10 +129,9 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y 
CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=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
@@ -209,7 +208,6 @@ CONFIG_ROOT_NFS=y 
CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_DEBUG_KERNEL=y

# CONFIG_ARM_UNWIND is not set