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 3d23414)
home-assistant · Jan 26, 2024 · 01c8c1a · 01c8c1a
1 parent 113348e
commit 01c8c1a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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