diff mbox series

ARM: configs: Update RealView defconfig

Message ID 20210714090040.182381-1-linus.walleij@linaro.org (mailing list archive)
State Accepted
Commit 56fa6e8a184489b47525488472e9bdcdcb59cd6f
Headers show
Series ARM: configs: Update RealView defconfig | expand

Commit Message

Linus Walleij July 14, 2021, 9 a.m. UTC
This updates the RealView defconfig for the changes
in the v5.14-rc1 kernel:

- The Framebuffer CONFIG_FB needs to be explicitly selected
  or we don't get any framebuffer anymore. DRM has stopped to
  select FB because of circular dependency.
- The CONFIG_FB_MODE_HELPERS are not needed when using DRM
  framebuffer emulation as DRM does.
- Drop two unused penguin logos.

Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB")
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
SoC folks: Please apply this directly for the v5.14 rc:s.
---
 arch/arm/configs/realview_defconfig | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Kees Cook July 14, 2021, 7:13 p.m. UTC | #1
On Wed, Jul 14, 2021 at 11:00:40AM +0200, Linus Walleij wrote:
> This updates the RealView defconfig for the changes
> in the v5.14-rc1 kernel:
> 
> - The Framebuffer CONFIG_FB needs to be explicitly selected
>   or we don't get any framebuffer anymore. DRM has stopped to
>   select FB because of circular dependency.
> - The CONFIG_FB_MODE_HELPERS are not needed when using DRM
>   framebuffer emulation as DRM does.
> - Drop two unused penguin logos.
> 
> Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB")
> Cc: Kees Cook <keescook@chromium.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Reviewed-by: Kees Cook <keescook@chromium.org>
patchwork-bot+linux-soc@kernel.org July 16, 2021, 9:22 p.m. UTC | #2
Hello:

This patch was applied to soc/soc.git (refs/heads/arm/fixes):

On Wed, 14 Jul 2021 11:00:40 +0200 you wrote:
> This updates the RealView defconfig for the changes
> in the v5.14-rc1 kernel:
> 
> - The Framebuffer CONFIG_FB needs to be explicitly selected
>   or we don't get any framebuffer anymore. DRM has stopped to
>   select FB because of circular dependency.
> - The CONFIG_FB_MODE_HELPERS are not needed when using DRM
>   framebuffer emulation as DRM does.
> - Drop two unused penguin logos.
> 
> [...]

Here is the summary with links:
  - ARM: configs: Update RealView defconfig
    https://git.kernel.org/soc/soc/c/56fa6e8a1844

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Arnd Bergmann July 16, 2021, 9:24 p.m. UTC | #3
From: Arnd Bergmann <arnd@arndb.de>

On Wed, 14 Jul 2021 11:00:40 +0200, Linus Walleij wrote:
> This updates the RealView defconfig for the changes
> in the v5.14-rc1 kernel:
> 
> - The Framebuffer CONFIG_FB needs to be explicitly selected
>   or we don't get any framebuffer anymore. DRM has stopped to
>   select FB because of circular dependency.
> - The CONFIG_FB_MODE_HELPERS are not needed when using DRM
>   framebuffer emulation as DRM does.
> - Drop two unused penguin logos.

Applied to arm/fixes, thanks!

[1/1] ARM: configs: Update RealView defconfig
      commit: 56fa6e8a184489b47525488472e9bdcdcb59cd6f

       Arnd
diff mbox series

Patch

diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 483c400dd391..4c01e313099f 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -64,11 +64,9 @@  CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_DISPLAY_CONNECTOR=y
 CONFIG_DRM_SIMPLE_BRIDGE=y
 CONFIG_DRM_PL111=y
-CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_DRIVERS is not set