[PATCH] apalis_imx6: fix video stdout in default environment

[PATCH] apalis_imx6: fix video stdout in default environment

[Anatolij Gustschin]

After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
---
 include/configs/apalis_imx6.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 6f03058a78..0db8e74e9a 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -173,7 +173,8 @@
 	BOOTENV \
 	"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
 		"usb start ; " \
-		"setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+		"setenv stdout serial,vidconsole; \
+		"setenv stdin serial,usbkbd\0" \
 	"boot_file=zImage\0" \
 	"console=ttymxc0\0" \
 	"defargs=enable_wait_mode=off vmalloc=400M\0" \
-- 
2.17.1

[PATCH] cm_fx6: fix video stdout in default environment

[Anatolij Gustschin]

After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Nikita Kiryanov <nikita@compulab.co.il>
---
 include/configs/cm_fx6.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 302907dcfb..35f251c15e 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -49,8 +49,8 @@
 	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
 	"fdtfile=undefined\0" \
 	"stdin=serial,usbkbd\0" \
-	"stdout=serial,vga\0" \
-	"stderr=serial,vga\0" \
+	"stdout=serial,vidconsole\0" \
+	"stderr=serial,vidconsole\0" \
 	"panel=HDMI\0" \
 	"autoload=no\0" \
 	"uImage=uImage-cm-fx6\0" \
-- 
2.17.1

[PATCH] cm_fx6: fix video stdout in default environment

[Anatolij Gustschin]

On Tue, 26 May 2020 12:03:19 +0200
Anatolij Gustschin agust at denx.de wrote:

> After migration to DM 'vga' name is not longer supported,
> change it to 'vidconsole' in the default environment.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Nikita Kiryanov <nikita@compulab.co.il>

Applied to u-boot-video/master, thanks!

--
Anatolij

[PATCH] colibri_imx6: fix video stdout in default environment

[Anatolij Gustschin]

After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
---
 include/configs/colibri_imx6.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 3d248ef4ef..99a601386c 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -156,7 +156,8 @@
 	BOOTENV \
 	"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
 		"usb start ; " \
-		"setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+		"setenv stdout serial,vidconsole; \
+		"setenv stdin serial,usbkbd\0" \
 	"boot_file=zImage\0" \
 	"console=ttymxc0\0" \
 	"defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
-- 
2.17.1

[PATCH v2] colibri_imx6: fix video stdout in default environment

[Anatolij Gustschin]

After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
---
Changes in v2:
 - fix build error

 include/configs/colibri_imx6.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 3d248ef4ef..af17a0a137 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -156,7 +156,8 @@
 	BOOTENV \
 	"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
 		"usb start ; " \
-		"setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+		"setenv stdout serial,vidconsole; " \
+		"setenv stdin serial,usbkbd\0" \
 	"boot_file=zImage\0" \
 	"console=ttymxc0\0" \
 	"defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
-- 
2.17.1

[PATCH v2] colibri_imx6: fix video stdout in default environment

[Igor Opaniuk]

Hi Anatolij,

On Tue, May 26, 2020 at 11:54 PM Anatolij Gustschin <agust@denx.de> wrote:
>
> After migration to DM 'vga' name is not longer supported,
> change it to 'vidconsole' in the default environment.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
> ---
> Changes in v2:
>  - fix build error
>
>  include/configs/colibri_imx6.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
> index 3d248ef4ef..af17a0a137 100644
> --- a/include/configs/colibri_imx6.h
> +++ b/include/configs/colibri_imx6.h
> @@ -156,7 +156,8 @@
>         BOOTENV \
>         "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd; " \
>                 "usb start ; " \
> -               "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
> +               "setenv stdout serial,vidconsole; " \
> +               "setenv stdin serial,usbkbd\0" \
>         "boot_file=zImage\0" \
>         "console=ttymxc0\0" \
>         "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \
> --
> 2.17.1
>

Thanks for the patch.
Acked-by: Igor Opaniuk <igor.opaniuk@toradex.com>

-- 
Best regards - Freundliche Gr?sse - Meilleures salutations

Igor Opaniuk

mailto: igor.opaniuk at gmail.com
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk

[PATCH v2] colibri_imx6: fix video stdout in default environment

[Anatolij Gustschin]

On Tue, 26 May 2020 22:54:29 +0200
Anatolij Gustschin agust at denx.de wrote:

> After migration to DM 'vga' name is not longer supported,
> change it to 'vidconsole' in the default environment.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Igor Opaniuk <igor.opaniuk@toradex.com>

Applied to u-boot-video/master, thanks!

--
Anatolij

[PATCH] nitrogen6x: update video console name

[Anatolij Gustschin]

After migration to DM 'vga' name is not longer supported,
Update the upgrade script to use 'vidconsole' instead.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Troy Kisky <troy.kisky@boundarydevices.com>
---
 board/boundary/nitrogen6x/6x_upgrade.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/boundary/nitrogen6x/6x_upgrade.txt b/board/boundary/nitrogen6x/6x_upgrade.txt
index 1a62bbf12e..cd3c33e407 100644
--- a/board/boundary/nitrogen6x/6x_upgrade.txt
+++ b/board/boundary/nitrogen6x/6x_upgrade.txt
@@ -1,4 +1,4 @@
-setenv stdout serial,vga
+setenv stdout serial,vidconsole
 echo "check U-Boot" ;
 setenv offset 0x400
 if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then
-- 
2.17.1

[PATCH] nitrogen6x: update video console name

[Troy Kisky]

On 5/26/2020 3:03 AM, Anatolij Gustschin wrote:
> After migration to DM 'vga' name is not longer supported,
> Update the upgrade script to use 'vidconsole' instead.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Troy Kisky <troy.kisky@boundarydevices.com>
> ---
>  board/boundary/nitrogen6x/6x_upgrade.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/boundary/nitrogen6x/6x_upgrade.txt b/board/boundary/nitrogen6x/6x_upgrade.txt
> index 1a62bbf12e..cd3c33e407 100644
> --- a/board/boundary/nitrogen6x/6x_upgrade.txt
> +++ b/board/boundary/nitrogen6x/6x_upgrade.txt
> @@ -1,4 +1,4 @@
> -setenv stdout serial,vga
> +setenv stdout serial,vidconsole
>  echo "check U-Boot" ;
>  setenv offset 0x400
>  if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk}:1 12000000 u-boot.nopadding ; then
> 

Thanks!

Acked-by: Troy Kisky <troy.kisky@boundarydevices.com>

[PATCH] nitrogen6x: update video console name

[Anatolij Gustschin]

On Tue, 26 May 2020 12:03:21 +0200
Anatolij Gustschin agust at denx.de wrote:

> After migration to DM 'vga' name is not longer supported,
> Update the upgrade script to use 'vidconsole' instead.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Troy Kisky <troy.kisky@boundarydevices.com>
> ---
>  board/boundary/nitrogen6x/6x_upgrade.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to u-boot-video/next, thanks!

--
Anatolij

[PATCH] video: ipuv3: remove non-DM code

[Anatolij Gustschin]

All ipuv3 users have been converted, drop obsolete code.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 drivers/video/imx/Kconfig        |  2 +-
 drivers/video/imx/mxc_ipuv3_fb.c | 43 --------------------------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/drivers/video/imx/Kconfig b/drivers/video/imx/Kconfig
index c33620e075..78eb0f29fb 100644
--- a/drivers/video/imx/Kconfig
+++ b/drivers/video/imx/Kconfig
@@ -1,7 +1,7 @@
 
 config VIDEO_IPUV3
 	bool "i.MX IPUv3 Core video support"
-	depends on (VIDEO || DM_VIDEO) && (MX5 || MX6)
+	depends on DM_VIDEO && (MX5 || MX6)
 	help
 	  This enables framebuffer driver for i.MX processors working
 	  on the IPUv3(Image Processing Unit) internal graphic processor.
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index 017a8fb22a..f1ab7a8375 100644
--- a/drivers/video/imx/mxc_ipuv3_fb.c
+++ b/drivers/video/imx/mxc_ipuv3_fb.c
@@ -38,10 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;
 static int mxcfb_map_video_memory(struct fb_info *fbi);
 static int mxcfb_unmap_video_memory(struct fb_info *fbi);
 
-#if !CONFIG_IS_ENABLED(DM_VIDEO)
-/* graphics setup */
-static GraphicDevice panel;
-#endif
 static struct fb_videomode const *gmode;
 static uint8_t gdisp;
 static uint32_t gpixfmt;
@@ -391,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);
 
-#if CONFIG_IS_ENABLED(DM_VIDEO)
 	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;
 	if (fbi->screen_base == 0) {
@@ -410,10 +401,7 @@ static int mxcfb_map_video_memory(struct fb_info *fbi)
 		(uint32_t) fbi->fix.smem_start, fbi->fix.smem_len);
 
 	fbi->screen_size = fbi->fix.smem_len;
-
-#if CONFIG_IS_ENABLED(VIDEO)
 	gd->fb_base = fbi->fix.smem_start;
-#endif
 
 	/* Clear the screen */
 	memset((char *)fbi->screen_base, 0, fbi->fix.smem_len);
@@ -543,18 +531,6 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp,
 
 	mxcfb_set_par(fbi);
 
-#if !CONFIG_IS_ENABLED(DM_VIDEO)
-	panel.winSizeX = mode->xres;
-	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;
-#endif
 #ifdef DEBUG
 	ipu_dump_registers();
 #endif
@@ -584,23 +560,6 @@ void ipuv3_fb_shutdown(void)
 	}
 }
 
-#if !CONFIG_IS_ENABLED(DM_VIDEO)
-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;
-}
-#endif
-
 int ipuv3_fb_init(struct fb_videomode const *mode,
 		  uint8_t disp,
 		  uint32_t pixfmt)
@@ -612,7 +571,6 @@ int ipuv3_fb_init(struct fb_videomode const *mode,
 	return 0;
 }
 
-#if CONFIG_IS_ENABLED(DM_VIDEO)
 enum {
 	/* Maximum display size we support */
 	LCD_MAX_WIDTH		= 1920,
@@ -710,4 +668,3 @@ U_BOOT_DRIVER(ipuv3_video) = {
 	.priv_auto_alloc_size = sizeof(struct ipuv3_video_priv),
 	.flags	= DM_FLAG_PRE_RELOC,
 };
-#endif /* CONFIG_DM_VIDEO */
-- 
2.17.1

[PATCH v2] apalis_imx6: fix video stdout in default environment

[Anatolij Gustschin]

After migration to DM 'vga' name is not longer supported,
change it to 'vidconsole' in the default environment.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
---
Changes in v2:
 - fix build error

 include/configs/apalis_imx6.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 6f03058a78..c6c2f46a17 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -173,7 +173,8 @@
 	BOOTENV \
 	"bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
 		"usb start ; " \
-		"setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
+		"setenv stdout serial,vidconsole; " \
+		"setenv stdin serial,usbkbd\0" \
 	"boot_file=zImage\0" \
 	"console=ttymxc0\0" \
 	"defargs=enable_wait_mode=off vmalloc=400M\0" \
-- 
2.17.1

[PATCH v2] apalis_imx6: fix video stdout in default environment

[Igor Opaniuk]

Hi Anatolij,

On Tue, May 26, 2020 at 11:52 PM Anatolij Gustschin <agust@denx.de> wrote:
>
> After migration to DM 'vga' name is not longer supported,
> change it to 'vidconsole' in the default environment.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
> ---
> Changes in v2:
>  - fix build error
>
>  include/configs/apalis_imx6.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
> index 6f03058a78..c6c2f46a17 100644
> --- a/include/configs/apalis_imx6.h
> +++ b/include/configs/apalis_imx6.h
> @@ -173,7 +173,8 @@
>         BOOTENV \
>         "bootcmd=setenv fdtfile ${fdt_file}; run distro_bootcmd ; " \
>                 "usb start ; " \
> -               "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
> +               "setenv stdout serial,vidconsole; " \
> +               "setenv stdin serial,usbkbd\0" \
>         "boot_file=zImage\0" \
>         "console=ttymxc0\0" \
>         "defargs=enable_wait_mode=off vmalloc=400M\0" \
> --
> 2.17.1
>

Thanks for the patch.
Acked-by: Igor Opaniuk <igor.opaniuk@toradex.com>

-- 
Best regards - Freundliche Gr?sse - Meilleures salutations

Igor Opaniuk

mailto: igor.opaniuk at gmail.com
skype: igor.opanyuk
+380 (93) 836 40 67
http://ua.linkedin.com/in/iopaniuk

[PATCH v2] apalis_imx6: fix video stdout in default environment

[Anatolij Gustschin]

On Tue, 26 May 2020 22:52:14 +0200
Anatolij Gustschin agust at denx.de wrote:

> After migration to DM 'vga' name is not longer supported,
> change it to 'vidconsole' in the default environment.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Igor Opaniuk <igor.opaniuk@toradex.com>

Applied to u-boot-video/master, thanks!

--
Anatolij