diff options
author | Arnd Bergmann <arnd@arndb.de> | 2023-01-31 09:07:50 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2023-01-31 09:07:50 +0100 |
commit | 7d576289b276af01dc7391429907375e4bd39fe7 (patch) | |
tree | b2b8f96b0249a65725ff0794a8abf15844bacb7c /arch/arm/configs | |
parent | 7ba26a7201cbfb067991dc988fecd59476be14f2 (diff) | |
parent | 0207a7dea8b3c9087560a9631b7c91197bf8c1bb (diff) |
Merge tag 'arm-soc/for-6.3/defconfig' of https://github.com/Broadcom/stblinux into soc/defconfig
This pull request contains Broadcom ARM SoCs defconfig updates for 6.3,
please pull the following:
- Stefan enables the necessary configuration options to make use of the
framebuffer on Raspberry Pi devices
* tag 'arm-soc/for-6.3/defconfig' of https://github.com/Broadcom/stblinux:
ARM: bcm2835_defconfig: Switch to SimpleDRM
ARM: bcm2835_defconfig: Enable the framebuffer
Link: https://lore.kernel.org/r/20230128193823.1628716-1-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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index a51babd178c2..ce092abcd323 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -107,7 +107,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_DRM=y CONFIG_DRM_V3D=y CONFIG_DRM_VC4=y -CONFIG_FB_SIMPLE=y +CONFIG_DRM_SIMPLEDRM=y +CONFIG_FB=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y |