Commit 14376871 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'arm-soc/for-5.20/defconfig' of https://github.com/Broadcom/stblinux into arm/defconfig

This pull request contains ARM SoCs defconfig changes for 5.20, please
pull the following:

- Peter enables CONFIG_DRM_V3D in order for the Raspberry Pi 4 systems
  to load the proper GPU module driver

- William updates the multi_v7_defconfig to replace the enabling of
  CONFIG_ARCH_BCM_63XX with CONFIG_ARCH_BCMBCA which is how this platform
  is now supported

* tag 'arm-soc/for-5.20/defconfig' of https://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Update configs for BCM63138
  ARM: configs: Enable DRM_V3D

Link: https://lore.kernel.org/r/20220711164451.3542127-2-f.fainelli@gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 01b66d2b a65ee523
...@@ -106,6 +106,7 @@ CONFIG_REGULATOR_GPIO=y ...@@ -106,6 +106,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_V3D=y
CONFIG_DRM_VC4=y CONFIG_DRM_VC4=y
CONFIG_FB_SIMPLE=y CONFIG_FB_SIMPLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
......
...@@ -28,9 +28,11 @@ CONFIG_ARCH_BCM_21664=y ...@@ -28,9 +28,11 @@ CONFIG_ARCH_BCM_21664=y
CONFIG_ARCH_BCM_23550=y CONFIG_ARCH_BCM_23550=y
CONFIG_ARCH_BCM2835=y CONFIG_ARCH_BCM2835=y
CONFIG_ARCH_BCM_53573=y CONFIG_ARCH_BCM_53573=y
CONFIG_ARCH_BCM_63XX=y
CONFIG_ARCH_BRCMSTB=y CONFIG_ARCH_BRCMSTB=y
CONFIG_ARCH_BCMBCA=y CONFIG_ARCH_BCMBCA=y
CONFIG_ARCH_BCMBCA_CORTEXA7=y
CONFIG_ARCH_BCMBCA_CORTEXA9=y
CONFIG_ARCH_BCMBCA_BRAHMAB15=y
CONFIG_ARCH_BERLIN=y CONFIG_ARCH_BERLIN=y
CONFIG_MACH_BERLIN_BG2=y CONFIG_MACH_BERLIN_BG2=y
CONFIG_MACH_BERLIN_BG2CD=y CONFIG_MACH_BERLIN_BG2CD=y
...@@ -747,6 +749,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m ...@@ -747,6 +749,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
CONFIG_DRM_IMX_TVE=m CONFIG_DRM_IMX_TVE=m
CONFIG_DRM_IMX_LDB=m CONFIG_DRM_IMX_LDB=m
CONFIG_DRM_IMX_HDMI=m CONFIG_DRM_IMX_HDMI=m
CONFIG_DRM_V3D=m
CONFIG_DRM_VC4=m CONFIG_DRM_VC4=m
CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV=m
CONFIG_DRM_MXSFB=m CONFIG_DRM_MXSFB=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment