random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-28 10:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

- migrate remaining imx5/imx6qd boards to DM_VIDEO

Browse Source 
- use 'vidconsole' stdout in nitrogen6x upgrade script
 - add option for selection of the vidconsole commands
   lcdputs and setcurs
 - allow building ipuv3 driver with disabled CONFIG_PANEL
 - make backlight and panel drivers optional
 - remove useless code from ipuv3 driver
 - extend existing DM_VIDEO work-around for console name
   to support 'vga'
 - remove non-DM code in ipuv3
 -----BEGIN PGP SIGNATURE-----
 
 iGwEABECACwWIQSC4hxrSoIUVfFO0kRM6ATMmsalXAUCXuvRkA4cYWd1c3RAZGVu
 eC5kZQAKCRBM6ATMmsalXMpeAJkB/FzsJ3O7putHrbLKOrLRF3zZYwCfQxa9jKuh
 DXNTYVrHS/43T8ijGYo=
 =7G75
 -----END PGP SIGNATURE-----

Merge tag 'video-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-video into next

- migrate remaining imx5/imx6qd boards to DM_VIDEO
- use 'vidconsole' stdout in nitrogen6x upgrade script
- add option for selection of the vidconsole commands
  lcdputs and setcurs
- allow building ipuv3 driver with disabled CONFIG_PANEL
- make backlight and panel drivers optional
- remove useless code from ipuv3 driver
- extend existing DM_VIDEO work-around for console name
  to support 'vga'
- remove non-DM code in ipuv3
This commit is contained in:
Tom Rini 2020-06-18 16:59:16 -04:00
commit 04909251fd
33 changed files with 218 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-tegra/Kconfig
View File

@ -58,7 +58,6 @@ config TEGRA_COMMON
select MISC select MISC
select OF_CONTROL select OF_CONTROL
select SPI select SPI
select VIDCONSOLE_AS_LCD if DM_VIDEO
imply CMD_DM imply CMD_DM
imply CRC32_VERIFY imply CRC32_VERIFY

2
board/boundary/nitrogen6x/6x_upgrade.txt
View File

@ -1,4 +1,4 @@
setenv stdout serial,vga setenv stdout serial,vidconsole
echo "check U-Boot" ; echo "check U-Boot" ;
setenv offset 0x400 setenv offset 0x400
if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then

5
board/congatec/cgtqmx6eval/cgtqmx6eval.c
View File

@ -627,6 +627,11 @@ int board_video_skip(void)
return 0; return 0;
} }
int ipu_displays_init(void)
{
return board_video_skip();
}
static void setup_display(void) static void setup_display(void)
{ {
struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;

7
common/console.c
View File

@ -713,7 +713,7 @@ struct stdio_dev *search_device(int flags, const char *name)
dev = stdio_get_by_name(name); dev = stdio_get_by_name(name);
#ifdef CONFIG_VIDCONSOLE_AS_LCD #ifdef CONFIG_VIDCONSOLE_AS_LCD
if (!dev && !strcmp(name, "lcd")) if (!dev && !strcmp(name, CONFIG_VIDCONSOLE_AS_LCD))
dev = stdio_get_by_name("vidconsole"); dev = stdio_get_by_name("vidconsole");
#endif #endif
@ -897,8 +897,9 @@ done:
stdio_print_current_devices(); stdio_print_current_devices();
#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
#ifdef CONFIG_VIDCONSOLE_AS_LCD #ifdef CONFIG_VIDCONSOLE_AS_LCD
if (strstr(stdoutname, "lcd")) if (strstr(stdoutname, CONFIG_VIDCONSOLE_AS_LCD))
printf("Warning: Please change 'lcd' to 'vidconsole' in stdout/stderr environment vars\n"); printf("Warning: Please change '%s' to 'vidconsole' in stdout/stderr environment vars\n",
CONFIG_VIDCONSOLE_AS_LCD);
#endif #endif
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE

10
configs/cgtqmx6eval_defconfig
View File

@ -79,7 +79,13 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

10
configs/dms-ba16-1g_defconfig
View File

@ -58,7 +58,13 @@ 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_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

10
configs/dms-ba16_defconfig
View File

@ -57,7 +57,13 @@ 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_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

10
configs/gwventana_emmc_defconfig
View File

@ -91,8 +91,14 @@ CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y CONFIG_FDT_FIXUP_PARTITIONS=y

10
configs/gwventana_gw5904_defconfig
View File

@ -95,8 +95,14 @@ CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y CONFIG_FDT_FIXUP_PARTITIONS=y

10
configs/gwventana_nand_defconfig
View File

@ -96,8 +96,14 @@ CONFIG_USB_ETH_CDC=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_FDT_FIXUP_PARTITIONS=y CONFIG_FDT_FIXUP_PARTITIONS=y

10
configs/marsboard_defconfig
View File

@ -38,7 +38,13 @@ CONFIG_DM_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_DM_VIDEO=y
# CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

10
configs/mx51evk_defconfig
View File

@ -36,7 +36,13 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

10
configs/mx53loco_defconfig
View File

@ -37,7 +37,13 @@ CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

12
configs/mx6cuboxi_defconfig
View File

@ -22,7 +22,7 @@ CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin serial,usbkbd; setenv stdout serial,vga; setenv stderr serial,vga; else setenv stdin serial; setenv stdout serial; setenv stderr serial; fi;" CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin serial,usbkbd; setenv stdout serial,vidconsole; setenv stderr serial,vidconsole; else setenv stdin serial; setenv stdout serial; setenv stderr serial; fi;"
CONFIG_BOUNCE_BUFFER=y CONFIG_BOUNCE_BUFFER=y
CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_SPL_FS_EXT4=y CONFIG_SPL_FS_EXT4=y
@ -59,6 +59,12 @@ CONFIG_DM_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_USB_KEYBOARD=y CONFIG_USB_KEYBOARD=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y

6
configs/mx6qsabrelite_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MX6=y CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x60000 CONFIG_ENV_OFFSET=0x60000
CONFIG_TARGET_NITROGEN6X=y CONFIG_TARGET_NITROGEN6X=y
@ -9,7 +10,6 @@ CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y CONFIG_CMD_HDMIDETECT=y
CONFIG_AHCI=y CONFIG_AHCI=y
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
# CONFIG_USE_BOOTCOMMAND is not set # CONFIG_USE_BOOTCOMMAND is not set
@ -70,6 +70,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set

6
configs/nitrogen6dl2g_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MX6=y CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_OFFSET=0xC0000
CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000
@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y CONFIG_CMD_HDMIDETECT=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
@ -74,6 +74,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set

6
configs/nitrogen6dl_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MX6=y CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_OFFSET=0xC0000
CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000
@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y CONFIG_CMD_HDMIDETECT=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
@ -74,6 +74,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set

6
configs/nitrogen6q2g_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MX6=y CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_OFFSET=0xC0000
CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000
@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y CONFIG_CMD_HDMIDETECT=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
@ -76,6 +76,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set

6
configs/nitrogen6q_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MX6=y CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_OFFSET=0xC0000
CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000
@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y CONFIG_CMD_HDMIDETECT=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
@ -76,6 +76,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set

6
configs/nitrogen6s1g_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MX6=y CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_OFFSET=0xC0000
CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000
@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y CONFIG_CMD_HDMIDETECT=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
@ -74,6 +74,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set

6
configs/nitrogen6s_defconfig
View File

@ -1,6 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MX6=y CONFIG_ARCH_MX6=y
CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SYS_TEXT_BASE=0x17800000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_OFFSET=0xC0000
CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_ENV_SECT_SIZE=0x2000
@ -9,7 +10,6 @@ CONFIG_DM_GPIO=y
CONFIG_NR_DRAM_BANKS=1 CONFIG_NR_DRAM_BANKS=1
CONFIG_CMD_HDMIDETECT=y CONFIG_CMD_HDMIDETECT=y
CONFIG_AHCI=y CONFIG_AHCI=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
CONFIG_BOOTDELAY=3 CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y CONFIG_USE_PREBOOT=y
@ -74,6 +74,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_ETHER=y CONFIG_USB_ETHER=y
CONFIG_USB_ETH_CDC=y CONFIG_USB_ETH_CDC=y
CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set

9
configs/pico-imx6_defconfig
View File

@ -73,5 +73,12 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525 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_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y # CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_SYS_WHITE_ON_BLACK=y

10
configs/riotboard_defconfig
View File

@ -38,7 +38,13 @@ CONFIG_DM_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_DM_VIDEO=y
# CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

10
configs/riotboard_spl_defconfig
View File

@ -48,8 +48,14 @@ CONFIG_DM_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_DM_VIDEO=y
# CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_SPL_OF_LIBFDT=y CONFIG_SPL_OF_LIBFDT=y

9
configs/tbs2910_defconfig
View File

@ -91,8 +91,15 @@ 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_I2C_EDID=y CONFIG_I2C_EDID=y
CONFIG_DM_VIDEO=y
# CONFIG_BACKLIGHT is not set
# CONFIG_CMD_VIDCONSOLE is not set
# CONFIG_VIDEO_BPP8 is not set
# CONFIG_VIDEO_BPP32 is not set
# CONFIG_VIDEO_ANSI is not set
# CONFIG_PANEL is not set
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set
CONFIG_OF_LIBFDT_ASSUME_MASK=0xff CONFIG_OF_LIBFDT_ASSUME_MASK=0xff
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set

49
drivers/video/Kconfig
View File

@ -14,9 +14,17 @@ config DM_VIDEO
option compiles in the video uclass and routes all LCD/video access option compiles in the video uclass and routes all LCD/video access
through this. through this.
config BACKLIGHT
bool "Enable panel backlight uclass support"
depends on DM_VIDEO
default y
help
This provides backlight uclass driver that enables basic panel
backlight support.
config BACKLIGHT_PWM config BACKLIGHT_PWM
bool "Generic PWM based Backlight Driver" bool "Generic PWM based Backlight Driver"
depends on DM_VIDEO && DM_PWM depends on BACKLIGHT && DM_PWM
default y default y
help help
If you have a LCD backlight adjustable by PWM, say Y to enable If you have a LCD backlight adjustable by PWM, say Y to enable
@ -27,7 +35,7 @@ config BACKLIGHT_PWM
config BACKLIGHT_GPIO config BACKLIGHT_GPIO
bool "Generic GPIO based Backlight Driver" bool "Generic GPIO based Backlight Driver"
depends on DM_VIDEO depends on BACKLIGHT
help help
If you have a LCD backlight adjustable by GPIO, say Y to enable If you have a LCD backlight adjustable by GPIO, say Y to enable
this driver. this driver.
@ -35,6 +43,14 @@ config BACKLIGHT_GPIO
it understands the standard device tree it understands the standard device tree
(leds/backlight/gpio-backlight.txt) (leds/backlight/gpio-backlight.txt)
config CMD_VIDCONSOLE
bool "Enable vidconsole commands lcdputs and setcurs"
depends on DM_VIDEO
default y
help
Enabling this will provide 'setcurs' and 'lcdputs' commands which
support cursor positioning and drawing strings on video framebuffer.
config VIDEO_BPP8 config VIDEO_BPP8
bool "Support 8-bit-per-pixel displays" bool "Support 8-bit-per-pixel displays"
depends on DM_VIDEO depends on DM_VIDEO
@ -143,17 +159,34 @@ config NO_FB_CLEAR
loads takes over the screen. This, for example, can be used to loads takes over the screen. This, for example, can be used to
keep splash image on screen until grub graphical boot menu starts. keep splash image on screen until grub graphical boot menu starts.
config PANEL
bool "Enable panel uclass support"
depends on DM_VIDEO
default y
help
This provides panel uclass driver that enables basic panel support.
config SIMPLE_PANEL
bool "Enable simple panel support"
depends on PANEL
default y
help
This turns on a simple panel driver that enables a compatible
video panel.
source "drivers/video/fonts/Kconfig" source "drivers/video/fonts/Kconfig"
config VIDCONSOLE_AS_LCD config VIDCONSOLE_AS_LCD
bool "Use 'vidconsole' when 'lcd' is seen in stdout" string "Use 'vidconsole' when string defined here is seen in stdout"
depends on DM_VIDEO depends on DM_VIDEO
default "lcd" if LCD || TEGRA_COMMON
default "vga" if !LCD
help help
This is a work-around for boards which have 'lcd' in their stdout This is a work-around for boards which have 'lcd' or 'vga' in their
environment variable, but have moved to use driver model for video. stdout environment variable, but have moved to use driver model for
In this case the console will no-longer work. While it is possible video. In this case the console will no-longer work. While it is
to update the environment, the breakage may be confusing for users. possible to update the environment, the breakage may be confusing for
This option will be removed around the end of 2016. users. This option will be removed around the end of 2020.
config VIDEO_COREBOOT config VIDEO_COREBOOT
bool "Enable coreboot framebuffer driver support" bool "Enable coreboot framebuffer driver support"

5
drivers/video/Makefile
View File

@ -4,17 +4,18 @@
# Wolfgang Denk, DENX Software Engineering, wd@denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
ifdef CONFIG_DM ifdef CONFIG_DM
obj-$(CONFIG_BACKLIGHT) += backlight-uclass.o
obj-$(CONFIG_BACKLIGHT_GPIO) += backlight_gpio.o obj-$(CONFIG_BACKLIGHT_GPIO) += backlight_gpio.o
obj-$(CONFIG_BACKLIGHT_PWM) += pwm_backlight.o obj-$(CONFIG_BACKLIGHT_PWM) += pwm_backlight.o
obj-$(CONFIG_CONSOLE_NORMAL) += console_normal.o obj-$(CONFIG_CONSOLE_NORMAL) += console_normal.o
obj-$(CONFIG_CONSOLE_ROTATION) += console_rotate.o obj-$(CONFIG_CONSOLE_ROTATION) += console_rotate.o
obj-$(CONFIG_CONSOLE_TRUETYPE) += console_truetype.o fonts/ obj-$(CONFIG_CONSOLE_TRUETYPE) += console_truetype.o fonts/
obj-$(CONFIG_DISPLAY) += display-uclass.o obj-$(CONFIG_DISPLAY) += display-uclass.o
obj-$(CONFIG_DM_VIDEO) += backlight-uclass.o
obj-$(CONFIG_VIDEO_MIPI_DSI) += dsi-host-uclass.o obj-$(CONFIG_VIDEO_MIPI_DSI) += dsi-host-uclass.o
obj-$(CONFIG_DM_VIDEO) += panel-uclass.o simple_panel.o
obj-$(CONFIG_DM_VIDEO) += video-uclass.o vidconsole-uclass.o obj-$(CONFIG_DM_VIDEO) += video-uclass.o vidconsole-uclass.o
obj-$(CONFIG_DM_VIDEO) += video_bmp.o obj-$(CONFIG_DM_VIDEO) += video_bmp.o
obj-$(CONFIG_PANEL) += panel-uclass.o
obj-$(CONFIG_SIMPLE_PANEL) += simple_panel.o
endif endif
obj-${CONFIG_EXYNOS_FB} += exynos/ obj-${CONFIG_EXYNOS_FB} += exynos/

2
drivers/video/imx/Kconfig
View File

@ -1,7 +1,7 @@
config VIDEO_IPUV3 config VIDEO_IPUV3
bool "i.MX IPUv3 Core video support" bool "i.MX IPUv3 Core video support"
depends on (VIDEO || DM_VIDEO) && (MX5 || MX6) depends on DM_VIDEO && (MX5 || MX6)
help help
This enables framebuffer driver for i.MX processors working This enables framebuffer driver for i.MX processors working
on the IPUv3(Image Processing Unit) internal graphic processor. on the IPUv3(Image Processing Unit) internal graphic processor.

12
drivers/video/imx/ipu_disp.c
View File

@ -1191,9 +1191,6 @@ int32_t ipu_disp_set_global_alpha(ipu_channel_t channel, unsigned char enable,
else else
bg_chan = 0; bg_chan = 0;
if (!g_ipu_clk_enabled)
clk_enable(g_ipu_clk);
if (bg_chan) { if (bg_chan) {
reg = __raw_readl(DP_COM_CONF()); reg = __raw_readl(DP_COM_CONF());
__raw_writel(reg & ~DP_COM_CONF_GWSEL, DP_COM_CONF()); __raw_writel(reg & ~DP_COM_CONF_GWSEL, DP_COM_CONF());
@ -1217,9 +1214,6 @@ int32_t ipu_disp_set_global_alpha(ipu_channel_t channel, unsigned char enable,
reg = __raw_readl(IPU_SRM_PRI2) | 0x8; reg = __raw_readl(IPU_SRM_PRI2) | 0x8;
__raw_writel(reg, IPU_SRM_PRI2); __raw_writel(reg, IPU_SRM_PRI2);
if (!g_ipu_clk_enabled)
clk_disable(g_ipu_clk);
return 0; return 0;
} }
@ -1246,9 +1240,6 @@ int32_t ipu_disp_set_color_key(ipu_channel_t channel, unsigned char enable,
(channel == MEM_BG_ASYNC1 || channel == MEM_FG_ASYNC1))) (channel == MEM_BG_ASYNC1 || channel == MEM_FG_ASYNC1)))
return -EINVAL; return -EINVAL;
if (!g_ipu_clk_enabled)
clk_enable(g_ipu_clk);
color_key_4rgb = 1; color_key_4rgb = 1;
/* Transform color key from rgb to yuv if CSC is enabled */ /* Transform color key from rgb to yuv if CSC is enabled */
if (((fg_csc_type == RGB2YUV) && (bg_csc_type == YUV2YUV)) || if (((fg_csc_type == RGB2YUV) && (bg_csc_type == YUV2YUV)) ||
@ -1286,8 +1277,5 @@ int32_t ipu_disp_set_color_key(ipu_channel_t channel, unsigned char enable,
reg = __raw_readl(IPU_SRM_PRI2) | 0x8; reg = __raw_readl(IPU_SRM_PRI2) | 0x8;
__raw_writel(reg, IPU_SRM_PRI2); __raw_writel(reg, IPU_SRM_PRI2);
if (!g_ipu_clk_enabled)
clk_disable(g_ipu_clk);
return 0; return 0;
} }

93
drivers/video/imx/mxc_ipuv3_fb.c
View File

@ -38,8 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;
static int mxcfb_map_video_memory(struct fb_info *fbi); static int mxcfb_map_video_memory(struct fb_info *fbi);
static int mxcfb_unmap_video_memory(struct fb_info *fbi); static int mxcfb_unmap_video_memory(struct fb_info *fbi);
/* graphics setup */
static GraphicDevice panel;
static struct fb_videomode const *gmode; static struct fb_videomode const *gmode;
static uint8_t gdisp; static uint8_t gdisp;
static uint32_t gpixfmt; static uint32_t gpixfmt;
@ -120,27 +118,6 @@ static uint32_t bpp_to_pixfmt(struct fb_info *fbi)
return pixfmt; return pixfmt;
} }
/*
* Set fixed framebuffer parameters based on variable settings.
*
* @param info framebuffer information pointer
*/
static int mxcfb_set_fix(struct fb_info *info)
{
struct fb_fix_screeninfo *fix = &info->fix;
struct fb_var_screeninfo *var = &info->var;
fix->line_length = var->xres_virtual * var->bits_per_pixel / 8;
fix->type = FB_TYPE_PACKED_PIXELS;
fix->accel = FB_ACCEL_NONE;
fix->visual = FB_VISUAL_TRUECOLOR;
fix->xpanstep = 1;
fix->ypanstep = 1;
return 0;
}
static int setup_disp_channel1(struct fb_info *fbi) static int setup_disp_channel1(struct fb_info *fbi)
{ {
ipu_channel_params_t params; ipu_channel_params_t params;
@ -226,7 +203,6 @@ static int mxcfb_set_par(struct fb_info *fbi)
ipu_disable_channel(mxc_fbi->ipu_ch); ipu_disable_channel(mxc_fbi->ipu_ch);
ipu_uninit_channel(mxc_fbi->ipu_ch); ipu_uninit_channel(mxc_fbi->ipu_ch);
mxcfb_set_fix(fbi);
mem_len = fbi->var.yres_virtual * fbi->fix.line_length; mem_len = fbi->var.yres_virtual * fbi->fix.line_length;
if (!fbi->fix.smem_start || (mem_len > fbi->fix.smem_len)) { if (!fbi->fix.smem_start || (mem_len > fbi->fix.smem_len)) {
@ -411,12 +387,7 @@ static int mxcfb_map_video_memory(struct fb_info *fbi)
} }
fbi->fix.smem_len = roundup(fbi->fix.smem_len, ARCH_DMA_MINALIGN); fbi->fix.smem_len = roundup(fbi->fix.smem_len, ARCH_DMA_MINALIGN);
#if CONFIG_IS_ENABLED(DM_VIDEO)
fbi->screen_base = (char *)gd->video_bottom; fbi->screen_base = (char *)gd->video_bottom;
#else
fbi->screen_base = (char *)memalign(ARCH_DMA_MINALIGN,
fbi->fix.smem_len);
#endif
fbi->fix.smem_start = (unsigned long)fbi->screen_base; fbi->fix.smem_start = (unsigned long)fbi->screen_base;
if (fbi->screen_base == 0) { if (fbi->screen_base == 0) {
@ -430,10 +401,7 @@ static int mxcfb_map_video_memory(struct fb_info *fbi)
(uint32_t) fbi->fix.smem_start, fbi->fix.smem_len); (uint32_t) fbi->fix.smem_start, fbi->fix.smem_len);
fbi->screen_size = fbi->fix.smem_len; fbi->screen_size = fbi->fix.smem_len;
#if CONFIG_IS_ENABLED(VIDEO)
gd->fb_base = fbi->fix.smem_start; gd->fb_base = fbi->fix.smem_start;
#endif
/* Clear the screen */ /* Clear the screen */
memset((char *)fbi->screen_base, 0, fbi->fix.smem_len); memset((char *)fbi->screen_base, 0, fbi->fix.smem_len);
@ -499,6 +467,8 @@ static struct fb_info *mxcfb_init_fbinfo(void)
return fbi; return fbi;
} }
extern struct clk *g_ipu_clk;
/* /*
* Probe routine for the framebuffer driver. It is called during the * Probe routine for the framebuffer driver. It is called during the
* driver binding process. The following functions are performed in * driver binding process. The following functions are performed in
@ -512,16 +482,14 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp,
{ {
struct fb_info *fbi; struct fb_info *fbi;
struct mxcfb_info *mxcfbi; struct mxcfb_info *mxcfbi;
int ret = 0;
/* /*
* Initialize FB structures * Initialize FB structures
*/ */
fbi = mxcfb_init_fbinfo(); fbi = mxcfb_init_fbinfo();
if (!fbi) { if (!fbi)
ret = -ENOMEM; return -ENOMEM;
goto err0;
}
mxcfbi = (struct mxcfb_info *)fbi->par; mxcfbi = (struct mxcfb_info *)fbi->par;
if (!g_dp_in_use) { if (!g_dp_in_use) {
@ -534,9 +502,11 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp,
mxcfbi->ipu_di = disp; mxcfbi->ipu_di = disp;
if (!ipu_clk_enabled())
clk_enable(g_ipu_clk);
ipu_disp_set_global_alpha(mxcfbi->ipu_ch, 1, 0x80); ipu_disp_set_global_alpha(mxcfbi->ipu_ch, 1, 0x80);
ipu_disp_set_color_key(mxcfbi->ipu_ch, 0, 0); ipu_disp_set_color_key(mxcfbi->ipu_ch, 0, 0);
strcpy(fbi->fix.id, "DISP3 BG");
g_dp_in_use = 1; g_dp_in_use = 1;
@ -547,7 +517,8 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp,
mxcfbi->ipu_di_pix_fmt = interface_pix_fmt; mxcfbi->ipu_di_pix_fmt = interface_pix_fmt;
fb_videomode_to_var(&fbi->var, mode); fb_videomode_to_var(&fbi->var, mode);
fbi->var.bits_per_pixel = 16; fbi->var.bits_per_pixel = 16;
fbi->fix.line_length = fbi->var.xres * (fbi->var.bits_per_pixel / 8); fbi->fix.line_length = fbi->var.xres_virtual *
(fbi->var.bits_per_pixel / 8);
fbi->fix.smem_len = fbi->var.yres_virtual * fbi->fix.line_length; fbi->fix.smem_len = fbi->var.yres_virtual * fbi->fix.line_length;
mxcfb_check_var(&fbi->var, fbi); mxcfb_check_var(&fbi->var, fbi);
@ -555,31 +526,17 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp,
/* Default Y virtual size is 2x panel size */ /* Default Y virtual size is 2x panel size */
fbi->var.yres_virtual = fbi->var.yres * 2; fbi->var.yres_virtual = fbi->var.yres * 2;
mxcfb_set_fix(fbi);
/* allocate fb first */ /* allocate fb first */
if (mxcfb_map_video_memory(fbi) < 0) if (mxcfb_map_video_memory(fbi) < 0)
return -ENOMEM; return -ENOMEM;
mxcfb_set_par(fbi); mxcfb_set_par(fbi);
panel.winSizeX = mode->xres; #ifdef DEBUG
panel.winSizeY = mode->yres;
panel.plnSizeX = mode->xres;
panel.plnSizeY = mode->yres;
panel.frameAdrs = (u32)fbi->screen_base;
panel.memSize = fbi->screen_size;
panel.gdfBytesPP = 2;
panel.gdfIndex = GDF_16BIT_565RGB;
ipu_dump_registers(); ipu_dump_registers();
#endif
return 0; return 0;
err0:
return ret;
} }
void ipuv3_fb_shutdown(void) void ipuv3_fb_shutdown(void)
@ -604,21 +561,6 @@ void ipuv3_fb_shutdown(void)
} }
} }
void *video_hw_init(void)
{
int ret;
ret = ipu_probe();
if (ret)
puts("Error initializing IPU\n");
ret = mxcfb_probe(gpixfmt, gdisp, gmode);
debug("Framebuffer at 0x%x\n", (unsigned int)panel.frameAdrs);
gd->fb_base = panel.frameAdrs;
return (void *)&panel;
}
int ipuv3_fb_init(struct fb_videomode const *mode, int ipuv3_fb_init(struct fb_videomode const *mode,
uint8_t disp, uint8_t disp,
uint32_t pixfmt) uint32_t pixfmt)
@ -630,7 +572,6 @@ int ipuv3_fb_init(struct fb_videomode const *mode,
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(DM_VIDEO)
enum { enum {
/* Maximum display size we support */ /* Maximum display size we support */
LCD_MAX_WIDTH = 1920, LCD_MAX_WIDTH = 1920,
@ -645,7 +586,6 @@ static int ipuv3_video_probe(struct udevice *dev)
#if defined(CONFIG_DISPLAY) #if defined(CONFIG_DISPLAY)
struct udevice *disp_dev; struct udevice *disp_dev;
#endif #endif
struct udevice *panel_dev;
u32 fb_start, fb_end; u32 fb_start, fb_end;
int ret; int ret;
@ -672,9 +612,13 @@ static int ipuv3_video_probe(struct udevice *dev)
return ret; return ret;
} }
#endif #endif
if (CONFIG_IS_ENABLED(PANEL)) {
struct udevice *panel_dev;
ret = uclass_get_device(UCLASS_PANEL, 0, &panel_dev); ret = uclass_get_device(UCLASS_PANEL, 0, &panel_dev);
if (panel_dev) if (panel_dev)
panel_enable_backlight(panel_dev); panel_enable_backlight(panel_dev);
}
uc_priv->xsize = gmode->xres; uc_priv->xsize = gmode->xres;
uc_priv->ysize = gmode->yres; uc_priv->ysize = gmode->yres;
@ -707,8 +651,12 @@ static int ipuv3_video_bind(struct udevice *dev)
} }
static const struct udevice_id ipuv3_video_ids[] = { static const struct udevice_id ipuv3_video_ids[] = {
#ifdef CONFIG_ARCH_MX6
{ .compatible = "fsl,imx6q-ipu" }, { .compatible = "fsl,imx6q-ipu" },
#endif
#ifdef CONFIG_ARCH_MX5
{ .compatible = "fsl,imx53-ipu" }, { .compatible = "fsl,imx53-ipu" },
#endif
{ } { }
}; };
@ -721,4 +669,3 @@ U_BOOT_DRIVER(ipuv3_video) = {
.priv_auto_alloc_size = sizeof(struct ipuv3_video_priv), .priv_auto_alloc_size = sizeof(struct ipuv3_video_priv),
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC,
}; };
#endif /* CONFIG_DM_VIDEO */

2
drivers/video/vidconsole-uclass.c
View File

@ -613,6 +613,7 @@ UCLASS_DRIVER(vidconsole) = {
.per_device_auto_alloc_size = sizeof(struct vidconsole_priv), .per_device_auto_alloc_size = sizeof(struct vidconsole_priv),
}; };
#if CONFIG_IS_ENABLED(CMD_VIDCONSOLE)
void vidconsole_position_cursor(struct udevice *dev, unsigned col, unsigned row) void vidconsole_position_cursor(struct udevice *dev, unsigned col, unsigned row)
{ {
struct vidconsole_priv *priv = dev_get_uclass_priv(dev); struct vidconsole_priv *priv = dev_get_uclass_priv(dev);
@ -673,3 +674,4 @@ U_BOOT_CMD(
"print string on video framebuffer", "print string on video framebuffer",
" <string>" " <string>"
); );
#endif /* CONFIG_IS_ENABLED(CMD_VIDCONSOLE) */

2
include/configs/advantech_dms-ba16.h
View File

@ -202,7 +202,6 @@
#define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_FSL_USDHC_NUM 3
/* Framebuffer */ /* Framebuffer */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_SPLASH_SCREEN_ALIGN
@ -211,7 +210,6 @@
#define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#endif
#define CONFIG_IMX6_PWM_PER_CLK 66000000 #define CONFIG_IMX6_PWM_PER_CLK 66000000

10
include/configs/tbs2910.h
View File

@ -37,11 +37,9 @@
#define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ #define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */
/* Framebuffer */ /* Framebuffer */
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_IMX_HDMI #define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_IMX_VIDEO_SKIP
#endif
/* PCI */ /* PCI */
#ifdef CONFIG_CMD_PCI #ifdef CONFIG_CMD_PCI
@ -102,11 +100,11 @@
"scriptaddr=0x14000000\0" \ "scriptaddr=0x14000000\0" \
"set_con_serial=setenv stdout serial; " \ "set_con_serial=setenv stdout serial; " \
"setenv stderr serial\0" \ "setenv stderr serial\0" \
"set_con_hdmi=setenv stdout serial,vga; " \ "set_con_hdmi=setenv stdout serial,vidconsole; " \
"setenv stderr serial,vga\0" \ "setenv stderr serial,vidconsole\0" \
"stderr=serial,vga\0" \ "stderr=serial,vidconsole\0" \
"stdin=serial,usbkbd\0" \ "stdin=serial,usbkbd\0" \
"stdout=serial,vga\0" "stdout=serial,vidconsole\0"
/* Enable distro boot */ /* Enable distro boot */
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \