domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: merge kmod-fbcon with kmod-fb

Browse Source 
As of commit in kernel:
6104c37094 fbcon: Make fbcon a built-time depency for fbdev
framebuffer console is build in into framebuffer module and there's no
standalone fbcon module. Therefore drop the kmod-fbcon and enable
console in kmod-fb. The only targets which use these modules are imx6
and geode, both are on kernel 4.14 so no fallback for other kernels is
introduced.
Being at that this commit also fixes autoload of fbdev for x86.

Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
(backported from 9c0ddafd46)
This commit is contained in:
Tomasz Maciej Nowak
2018-03-31 00:12:03 +02:00
committed by Jo-Philipp Wich
parent db4341d907
commit 903ef9aaec
1 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
package/kernel/linux/modules/video.mk
View File

@@ -56,34 +56,13 @@ $(eval $(call KernelPackage,backlight-pwm))
define KernelPackage/fb define KernelPackage/fb
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)
TITLE:=Framebuffer support TITLE:=Framebuffer and framebuffer console support
DEPENDS:=@DISPLAY_SUPPORT DEPENDS:=@DISPLAY_SUPPORT
KCONFIG:= \ KCONFIG:= \
CONFIG_FB \ CONFIG_FB \
CONFIG_FB_MXS=n \ CONFIG_FB_MXS=n \
CONFIG_FB_SM750=n CONFIG_FB_SM750=n \
FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb.ko CONFIG_FRAMEBUFFER_CONSOLE=y \
AUTOLOAD:=$(call AutoLoad,06,fb)
endef
define KernelPackage/fb/description
Kernel support for framebuffers
endef
define KernelPackage/fb/x86
FILES+=$(LINUX_DIR)/arch/x86/video/fbdev.ko
AUTOLOAD+=$(call AutoLoad,06,fbdev fb)
endef
$(eval $(call KernelPackage,fb))
define KernelPackage/fbcon
SUBMENU:=$(VIDEO_MENU)
TITLE:=Framebuffer Console support
DEPENDS:=+kmod-fb @!LINUX_4_14
KCONFIG:= \
CONFIG_FRAMEBUFFER_CONSOLE \
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y \ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y \
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y \ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y \
CONFIG_FONTS=y \ CONFIG_FONTS=y \
@@ -102,23 +81,22 @@ define KernelPackage/fbcon
CONFIG_CONSOLE_TRANSLATIONS=y \ CONFIG_CONSOLE_TRANSLATIONS=y \
CONFIG_VT_CONSOLE=y \ CONFIG_VT_CONSOLE=y \
CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VT_HW_CONSOLE_BINDING=y
FILES:= \ FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb.ko \
$(LINUX_DIR)/drivers/video/console/bitblit.ko \
$(LINUX_DIR)/drivers/video/console/softcursor.ko \
$(LINUX_DIR)/drivers/video/console/fbcon.ko \
$(LINUX_DIR)/drivers/video/console/fbcon_rotate.ko \
$(LINUX_DIR)/drivers/video/console/fbcon_cw.ko \
$(LINUX_DIR)/drivers/video/console/fbcon_ud.ko \
$(LINUX_DIR)/drivers/video/console/fbcon_ccw.ko \
$(LINUX_DIR)/lib/fonts/font.ko $(LINUX_DIR)/lib/fonts/font.ko
AUTOLOAD:=$(call AutoLoad,94,font softcursor tileblit fbcon_cw fbcon_ud fbcon_ccw fbcon_rotate bitblit fbcon) AUTOLOAD:=$(call AutoLoad,06,fb font)
endef endef
define KernelPackage/fbcon/description define KernelPackage/fb/description
Kernel support for framebuffer console Kernel support for framebuffers and framebuffer console.
endef endef
$(eval $(call KernelPackage,fbcon)) define KernelPackage/fb/x86
FILES+=$(LINUX_DIR)/arch/x86/video/fbdev.ko
AUTOLOAD:=$(call AutoLoad,06,fbdev fb font)
endef
$(eval $(call KernelPackage,fb))
define KernelPackage/fb-cfb-fillrect define KernelPackage/fb-cfb-fillrect
SUBMENU:=$(VIDEO_MENU) SUBMENU:=$(VIDEO_MENU)