From 01c8c1a5fa9e26c2dacad449c783a539ee034401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Fri, 26 Jan 2024 14:04:14 +0100 Subject: [PATCH] Add kernel options missing as a result of enabling CONFIG_EXPERT (#3114) Enabling CONFIG_EXPERT, which was a dependency of some options we try to set by our config fragments, had a side-effect of toggling some other options, most importantly the framebuffer console support. Enable the options found by diffing old and new kernel configs. Fixes #3112 (cherry picked from commit 3d234144a23993b69b569c8d2c666945e2c274a1) --- buildroot-external/board/hardkernel/kernel-amlogic.config | 1 + buildroot-external/board/khadas/kernel-vim.config | 1 + buildroot-external/board/pc/generic-x86-64/kernel.config | 4 ++++ buildroot-external/board/pc/ova/kernel.config | 3 +++ buildroot-external/kernel/device-support.config | 5 +++-- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/buildroot-external/board/hardkernel/kernel-amlogic.config b/buildroot-external/board/hardkernel/kernel-amlogic.config index 6135f694006..fbc3e5c8423 100644 --- a/buildroot-external/board/hardkernel/kernel-amlogic.config +++ b/buildroot-external/board/hardkernel/kernel-amlogic.config @@ -557,6 +557,7 @@ CONFIG_FB_EFI=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_LP855X=m +CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_HDA_INTEL=m diff --git a/buildroot-external/board/khadas/kernel-vim.config b/buildroot-external/board/khadas/kernel-vim.config index df486b6bfcc..db1fd17b35d 100644 --- a/buildroot-external/board/khadas/kernel-vim.config +++ b/buildroot-external/board/khadas/kernel-vim.config @@ -484,6 +484,7 @@ CONFIG_DRM_PANFROST=m CONFIG_FB=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=m +CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_DYNAMIC_MINORS=y diff --git a/buildroot-external/board/pc/generic-x86-64/kernel.config b/buildroot-external/board/pc/generic-x86-64/kernel.config index 72602c5cd3c..a4ab06b71c5 100644 --- a/buildroot-external/board/pc/generic-x86-64/kernel.config +++ b/buildroot-external/board/pc/generic-x86-64/kernel.config @@ -22,6 +22,9 @@ CONFIG_SYSFB=y CONFIG_FB=y CONFIG_FB_EFI=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y + CONFIG_DRM=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_AMDGPU=m @@ -129,6 +132,7 @@ CONFIG_SENSORS_CORETEMP=m CONFIG_UHID=y +CONFIG_LPC_ICH=y CONFIG_ITCO_WDT=y CONFIG_IT87_WDT=y diff --git a/buildroot-external/board/pc/ova/kernel.config b/buildroot-external/board/pc/ova/kernel.config index 57a618c3956..b0225957680 100644 --- a/buildroot-external/board/pc/ova/kernel.config +++ b/buildroot-external/board/pc/ova/kernel.config @@ -85,6 +85,9 @@ CONFIG_SYSFB_SIMPLEFB=y CONFIG_FB=y CONFIG_FB_EFI=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y + CONFIG_MMC=y CONFIG_MMC_BLOCK=y CONFIG_MMC_SDHCI=y diff --git a/buildroot-external/kernel/device-support.config b/buildroot-external/kernel/device-support.config index d7ece43833d..123450e25b9 100644 --- a/buildroot-external/kernel/device-support.config +++ b/buildroot-external/kernel/device-support.config @@ -60,14 +60,15 @@ CONFIG_BT_MTKUART=m # Multimedia core support CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_SUPPORT_FILTER=n +CONFIG_MEDIA_SUPPORT_FILTER=y +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_CONTROLLER_DVB=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEOBUF2_CORE=m