diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-07-13 00:07:46 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-07-13 00:07:47 +0300 |
| commit | 14376871658a2bb6110f55c8b2a4206a087f3e13 (patch) | |
| tree | 50e30e1872aadd406ee3b09ad7f4dffb9dee3f42 /arch/arm/configs | |
| parent | 01b66d2b33cc3ac176ac38694b800c859c488480 (diff) | |
| parent | a65ee523a9e41d0bf046cf0107e6bbf05d068af2 (diff) | |
| download | linux-14376871658a2bb6110f55c8b2a4206a087f3e13.tar.xz | |
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.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index a9ed79b7f871..9270512c14ea 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -106,6 +106,7 @@ CONFIG_REGULATOR_GPIO=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_DRM=y +CONFIG_DRM_V3D=y CONFIG_DRM_VC4=y CONFIG_FB_SIMPLE=y CONFIG_FRAMEBUFFER_CONSOLE=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ce9826bce29b..6780da0c9781 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -28,9 +28,11 @@ CONFIG_ARCH_BCM_21664=y CONFIG_ARCH_BCM_23550=y CONFIG_ARCH_BCM2835=y CONFIG_ARCH_BCM_53573=y -CONFIG_ARCH_BCM_63XX=y CONFIG_ARCH_BRCMSTB=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_MACH_BERLIN_BG2=y CONFIG_MACH_BERLIN_BG2CD=y @@ -747,6 +749,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m CONFIG_DRM_IMX_LDB=m CONFIG_DRM_IMX_HDMI=m +CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_MXSFB=m |