| Message ID | 20210713133708.94397-1-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 49e7757a73d181b35851cb01b5d285888014f8b2 |
| Headers | show |
| Series | ARM: configs: Update Vexpress defconfig | expand |
On Tue, Jul 13, 2021 at 03:37:08PM +0200, Linus Walleij wrote: > This updates the Versatile Express 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. > - CONFIG_CMA options were moved around. > - CONFIG_MODULES options were moved around. > - CONFIG_CRYPTO_HW was moved around. > > Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") > Cc: Kees Cook <keescook@chromium.org> > Cc: Sudeep Holla <sudeep.holla@arm.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > SoC folks: please apply this directly for v5.14 if Sudeep is > OK with the patch. Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Hello: This patch was applied to soc/soc.git (refs/heads/arm/fixes): On Tue, 13 Jul 2021 15:37:08 +0200 you wrote: > This updates the Versatile Express 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. > - CONFIG_CMA options were moved around. > - CONFIG_MODULES options were moved around. > - CONFIG_CRYPTO_HW was moved around. > > [...] Here is the summary with links: - ARM: configs: Update Vexpress defconfig https://git.kernel.org/soc/soc/c/49e7757a73d1 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
From: Arnd Bergmann <arnd@arndb.de> On Tue, 13 Jul 2021 15:37:08 +0200, Linus Walleij wrote: > This updates the Versatile Express 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. > - CONFIG_CMA options were moved around. > - CONFIG_MODULES options were moved around. > - CONFIG_CRYPTO_HW was moved around. Applied to arm/fixes, thanks! [1/1] ARM: configs: Update Vexpress defconfig commit: 49e7757a73d181b35851cb01b5d285888014f8b2 Arnd
diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index 4479369540f2..b5e246dd23f4 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig @@ -11,9 +11,6 @@ CONFIG_CPUSETS=y # CONFIG_NET_NS is not set CONFIG_BLK_DEV_INITRD=y CONFIG_PROFILING=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_VEXPRESS_DCSCB=y CONFIG_ARCH_VEXPRESS_TC2_PM=y @@ -23,14 +20,17 @@ CONFIG_MCPM=y CONFIG_VMSPLIT_2G=y CONFIG_NR_CPUS=8 CONFIG_ARM_PSCI=y -CONFIG_CMA=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyAMA0" CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_CMA=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -43,7 +43,6 @@ CONFIG_IP_PNP_BOOTP=y CONFIG_NET_9P=y CONFIG_NET_9P_VIRTIO=y CONFIG_DEVTMPFS=y -CONFIG_DMA_CMA=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y @@ -59,7 +58,6 @@ CONFIG_VIRTIO_BLK=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_VIRTIO=y CONFIG_ATA=y -# CONFIG_SATA_PMP is not set CONFIG_NETDEVICES=y CONFIG_VIRTIO_NET=y CONFIG_SMC91X=y @@ -81,11 +79,9 @@ CONFIG_DRM=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_SII902X=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 @@ -136,10 +132,11 @@ CONFIG_ROOT_NFS=y CONFIG_9P_FS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y +# CONFIG_CRYPTO_HW is not set +CONFIG_DMA_CMA=y CONFIG_DEBUG_INFO=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_USER=y -# CONFIG_CRYPTO_HW is not set
This updates the Versatile Express 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. - CONFIG_CMA options were moved around. - CONFIG_MODULES options were moved around. - CONFIG_CRYPTO_HW was moved around. Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Cc: Kees Cook <keescook@chromium.org> Cc: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- SoC folks: please apply this directly for v5.14 if Sudeep is OK with the patch. --- arch/arm/configs/vexpress_defconfig | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)