Message ID | 20190505231336.27698-6-marex@denx.de |
---|---|
State | Superseded |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot,1/6] ARM: dts: imx: novena: Import Novena DT from Linux | expand |
On 2019-05-06, Marek Vasut wrote: > Enable DM Video support on iMX6Q Novena and fix minor details > to restore previous behavior of the system. Also required: "[U-Boot] video: ipuv3: Set max display bpp to 32" https://patchwork.ozlabs.org/patch/1095618/ Otherwise it would hang after initializing video. I don't see video output though. Not sure when I last tested video output from u-boot, though. But at least it boots! live well, vagrant > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> > --- > configs/novena_defconfig | 6 +++--- > include/configs/novena.h | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/configs/novena_defconfig b/configs/novena_defconfig > index c5dbbb0b4d..3ae485245d 100644 > --- a/configs/novena_defconfig > +++ b/configs/novena_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_SPL_GPIO_SUPPORT=y > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > +CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_KOSAGI_NOVENA=y > CONFIG_SPL_MMC_SUPPORT=y > @@ -15,7 +16,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y > CONFIG_CMD_HDMIDETECT=y > CONFIG_AHCI=y > CONFIG_DISTRO_DEFAULTS=y > -# CONFIG_SYS_MALLOC_F is not set > CONFIG_FIT=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" > CONFIG_USE_BOOTARGS=y > @@ -70,7 +70,7 @@ CONFIG_USB_ETH_CDC=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_USB_ETHER_SMSC95XX=y > +CONFIG_DM_VIDEO=y > +CONFIG_SYS_WHITE_ON_BLACK=y > CONFIG_VIDEO_IPUV3=y > -CONFIG_VIDEO=y > -# CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_FAT_WRITE=y > diff --git a/include/configs/novena.h b/include/configs/novena.h > index bc7383e957..cdc437c492 100644 > --- a/include/configs/novena.h > +++ b/include/configs/novena.h > @@ -119,14 +119,12 @@ > #endif > > /* Video output */ > -#ifdef CONFIG_VIDEO > #define CONFIG_VIDEO_BMP_RLE8 > #define CONFIG_SPLASH_SCREEN > #define CONFIG_BMP_16BPP > #define CONFIG_VIDEO_LOGO > #define CONFIG_IMX_HDMI > #define CONFIG_IMX_VIDEO_SKIP > -#endif > > /* Extra U-Boot environment. */ > #ifndef CONFIG_SPL_BUILD > @@ -144,6 +142,8 @@ > "ramdisk_addr_r=0x28000000\0" \ > "fdt_addr_r=0x18000000\0" \ > "fdtfile=imx6q-novena.dtb\0" \ > + "stdout=serial,vidconsole\0" \ > + "stderr=serial,vidconsole\0" \ > "addcons=" \ > "setenv bootargs ${bootargs} " \ > "console=${consdev},${baudrate}\0" \ > -- > 2.20.1
On 5/6/19 5:31 AM, Vagrant Cascadian wrote: > On 2019-05-06, Marek Vasut wrote: >> Enable DM Video support on iMX6Q Novena and fix minor details >> to restore previous behavior of the system. > > Also required: > > "[U-Boot] video: ipuv3: Set max display bpp to 32" > https://patchwork.ozlabs.org/patch/1095618/ > > Otherwise it would hang after initializing video. > > I don't see video output though. Not sure when I last tested video > output from u-boot, though. But at least it boots! Try "setenv stdout serial,vidconsole" , does it help ?
On 2019-05-06, Marek Vasut wrote: > On 5/6/19 5:31 AM, Vagrant Cascadian wrote: >> On 2019-05-06, Marek Vasut wrote: >>> Enable DM Video support on iMX6Q Novena and fix minor details >>> to restore previous behavior of the system. >> >> Also required: >> >> "[U-Boot] video: ipuv3: Set max display bpp to 32" >> https://patchwork.ozlabs.org/patch/1095618/ >> >> Otherwise it would hang after initializing video. >> >> I don't see video output though. Not sure when I last tested video >> output from u-boot, though. But at least it boots! > > Try "setenv stdout serial,vidconsole" , does it help ? Yes, that did help; thanks! So it's working on some level... live well, vagrant
diff --git a/configs/novena_defconfig b/configs/novena_defconfig index c5dbbb0b4d..3ae485245d 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_MX6_DDRCAL=y CONFIG_TARGET_KOSAGI_NOVENA=y CONFIG_SPL_MMC_SUPPORT=y @@ -15,7 +16,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y -# CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" CONFIG_USE_BOOTARGS=y @@ -70,7 +70,7 @@ CONFIG_USB_ETH_CDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_IPUV3=y -CONFIG_VIDEO=y -# CONFIG_VIDEO_SW_CURSOR is not set CONFIG_FAT_WRITE=y diff --git a/include/configs/novena.h b/include/configs/novena.h index bc7383e957..cdc437c492 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -119,14 +119,12 @@ #endif /* Video output */ -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#endif /* Extra U-Boot environment. */ #ifndef CONFIG_SPL_BUILD @@ -144,6 +142,8 @@ "ramdisk_addr_r=0x28000000\0" \ "fdt_addr_r=0x18000000\0" \ "fdtfile=imx6q-novena.dtb\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" \ "addcons=" \ "setenv bootargs ${bootargs} " \ "console=${consdev},${baudrate}\0" \
Enable DM Video support on iMX6Q Novena and fix minor details to restore previous behavior of the system. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- configs/novena_defconfig | 6 +++--- include/configs/novena.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)