Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

video: move MXS to Kconfig

Browse source 
Move CONFIG_VIDEO_MXS from board headers to Kconfig
and drop it from obsolete cfb_console driver.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
This commit is contained in:
Anatolij Gustschin 2021-10-04 17:33:12 +02:00
parent 450d937812
commit 79c05335a9
23 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configs/colibri-imx6ull_defconfig
View file

@ -95,6 +95,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

1
configs/colibri_imx7_defconfig
View file

@ -91,6 +91,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

1
configs/imxrt1050-evk_defconfig
View file

@ -72,6 +72,7 @@ CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set # CONFIG_SPL_DM_USB is not set
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
CONFIG_BACKLIGHT_GPIO=y CONFIG_BACKLIGHT_GPIO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y

1
configs/mx6ul_14x14_evk_defconfig
View file

@ -93,6 +93,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

1
configs/mx6ul_9x9_evk_defconfig
View file

@ -83,6 +83,7 @@ CONFIG_IMX_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

1
configs/opos6uldev_defconfig
View file

@ -103,6 +103,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
# CONFIG_VIDEO_BPP8 is not set # CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set # CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y

1
configs/pico-imx6ul_defconfig
View file

@ -78,5 +78,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

1
configs/pico-imx7d_bl33_defconfig
View file

@ -81,6 +81,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

1
configs/pico-imx7d_defconfig
View file

@ -85,6 +85,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_MXS=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SCREEN_ALIGN=y

6
drivers/video/Kconfig
View file

@ -648,6 +648,12 @@ source "drivers/video/bridge/Kconfig"
source "drivers/video/imx/Kconfig" source "drivers/video/imx/Kconfig"
config VIDEO_MXS
bool "Enable video support on i.MX28/i.MX6UL/i.MX7 SoCs"
depends on DM_VIDEO
help
Enable framebuffer driver for i.MX28/i.MX6UL/i.MX7 processors
config VIDEO_NX config VIDEO_NX
bool "Enable video support on Nexell SoC" bool "Enable video support on Nexell SoC"
depends on ARCH_S5P6818 || ARCH_S5P4418 depends on ARCH_S5P6818 || ARCH_S5P4418

4
drivers/video/cfb_console.c
View file

@ -78,10 +78,6 @@
#include <dm/ofnode.h> #include <dm/ofnode.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#if defined(CONFIG_VIDEO_MXS)
#define VIDEO_FB_16BPP_WORD_SWAP
#endif
/* /*
* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc. * Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc.
*/ */

3
include/configs/colibri-imx6ull.h
View file

@ -134,8 +134,7 @@
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#define DFU_DEFAULT_POLL_TIMEOUT 300 #define DFU_DEFAULT_POLL_TIMEOUT 300
#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #if defined(CONFIG_DM_VIDEO)
#define CONFIG_VIDEO_MXS
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO

3
include/configs/colibri_imx7.h
View file

@ -200,8 +200,7 @@
#define CONFIG_USBD_HS #define CONFIG_USBD_HS
#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #if defined(CONFIG_DM_VIDEO)
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#endif #endif

1
include/configs/imxrt1050-evk.h
View file

@ -22,7 +22,6 @@
DMAMEM_SZ_ALL) DMAMEM_SZ_ALL)
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO

2
include/configs/mx23evk.h
View file

@ -26,7 +26,7 @@
#endif #endif
/* Framebuffer support */ /* Framebuffer support */
#ifdef CONFIG_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
#endif #endif

2
include/configs/mx28evk.h
View file

@ -40,7 +40,7 @@
#endif #endif
/* Framebuffer support */ /* Framebuffer support */
#ifdef CONFIG_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10) #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
#endif #endif

3
include/configs/mx6sxsabresd.h
View file

@ -161,8 +161,7 @@
#endif #endif
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR

1
include/configs/mx6ul_14x14_evk.h
View file

@ -167,7 +167,6 @@
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#if defined(CONFIG_DM_VIDEO) #if defined(CONFIG_DM_VIDEO)
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR

3
include/configs/mx7dsabresd.h
View file

@ -126,8 +126,7 @@
#define CONFIG_USBD_HS #define CONFIG_USBD_HS
#ifdef CONFIG_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#endif #endif

5
include/configs/mxs.h
View file

@ -105,11 +105,6 @@
#endif #endif
#endif #endif
/* LCD */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_MXS
#endif
/* NAND */ /* NAND */
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1

1
include/configs/opos6uldev.h
View file

@ -43,7 +43,6 @@
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_VIDEO_MXS
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR
#endif #endif
#endif #endif

3
include/configs/pico-imx6ul.h
View file

@ -135,8 +135,7 @@
*/ */
#define CONFIG_BOARD_SIZE_LIMIT 715776 #define CONFIG_BOARD_SIZE_LIMIT 715776
#ifdef CONFIG_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR

1
include/configs/pico-imx7d.h
View file

@ -126,7 +126,6 @@
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 #define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#endif #endif