p1022ds: add video support
PATCH v2 1/1 p1022ds: add video support
Add support for the DIU controller. If CONFIG_VIDEO is defined, then the console will appear on a DVI monitor instead of the serial port.
--- board/freescale/p1022ds/Makefile | 2 + board/freescale/p1022ds/diu.c | 148 ++++++++++++++++++++++++++++++++++++++ include/configs/P1022DS.h | 13 ++-- 3 files changed, 158 insertions(+), 5 deletions(-) create mode 100644 board/freescale/p1022ds/diu.c
board/freescale/p1022ds/Makefile +2 -0
@@ -16,6 +16,8 @@ COBJS-y += ddr.o COBJS-y += law.o COBJS-y += tlb.o +COBJS-$(CONFIG_FSL_DIU_FB) += diu.o + SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) SOBJS := $(addprefix $(obj),$(SOBJS))
board/freescale/p1022ds/diu.c new file +148 -0
148 lines not on this page · raw message
include/configs/P1022DS.h +8 -5
@@ -177,14 +177,17 @@#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_FSL_DIU_FB -#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) -/* Video */ -/* #define CONFIG_VIDEO */ -#ifdef CONFIG_VIDEO +#undef CONFIG_FSL_DIU_FB + +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) +#define CONFIG_VIDEO +#define CONFIG_CMD_BMP #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_BMP_LOGO #endif /*
Signature · 1 line
1.7.2.3
PATCH v2 1/1 p1022ds: add video support
Hi Timur,
Quoted 10 lines · On Wed, 22 Sep 2010 11:46:10 -0500 Timur Tabi <[email protected]> wrote:
Add support for the DIU controller. If
CONFIG_VIDEOis defined, then the console will appear on a DVI monitor instead of the serial port.Signed-off-by Timur Tabi <[email protected]>--- board/freescale/p1022ds/Makefile | 2 + board/freescale/p1022ds/diu.c | 148 ++++++++++++++++++++++++++++++++++++++ include/configs/P1022DS.h | 13 ++-- 3 files changed, 158 insertions(+), 5 deletions(-) create mode 100644 board/freescale/p1022ds/diu.c
Thanks for fixing this. But as Wolfgang said in another thread we should factor out common DIU code. Therefore I'm afraid that Wolfgang will reject this patch if I submit a pull request for it. Could you please apply a patch I'll send you shortly and test if it breaks DIU support on P1022DS and MPC8610HPCD? Thanks!
Anatolij
PATCH 1/1 fsl_diu_fb: further refactoring of FLS DIU code
In reply to Timur TabiThis is the first patch version for testing on HW I do not have (mpc8610hpcd, p1022ds). Tested on pdm360ng board.
The patch will be modified to fix board config files as needed in the final version. We probably should also move fsl_diu_fb.c file to 'drivers/video'.
---
arch/powerpc/cpu/mpc512x/diu.c | 62 ++----------------
board/davedenx/aria/aria.c | 5 --
board/freescale/common/fsl_diu_fb.c | 41 ++++++++++++-
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 74 +++------------------
board/freescale/p1022ds/diu.c | 52 ++-------------
board/pdm360ng/pdm360ng.c | 3 -
include/configs/MPC8610HPCD.h | 4 +-
include/configs/P1022DS.h | 2 +-
{board/freescale/common => include}/fsl_diu_fb.h | 1 +
9 files changed, 70 insertions(+), 174 deletions(-)
rename {board/freescale/common => include}/fsl_diu_fb.h (97%)arch/powerpc/cpu/mpc512x/diu.c +7 -55
@@ -27,17 +27,10 @@#include <command.h> #include <asm/io.h> -#include "../../../../board/freescale/common/fsl_diu_fb.h" - -#if defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE ) -#include <stdio_dev.h> -#include <video_fb.h> -#endif +#include <fsl_diu_fb.h> DECLARE_GLOBAL_DATA_PTR ; -static int xres, yres; -void diu_set_pixel_clock (unsigned int pixclock) {volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ;
@@ -58,61 +51,20 @@ void diu_set_pixel_clock(unsigned int pixclock)debug ("DIU: Modified value of CLKDVDR = 0x%08x\n" ,in_be32 (clkdvdr)); } -int mpc5121_diu_init (void ) +int platform_diu_init (unsigned int *xres,unsigned int *yres) {unsigned int pixel_format;#if defined(CONFIG_VIDEO_XRES ) & defined(CONFIG_VIDEO_YRES ) - xres =CONFIG_VIDEO_XRES ; - yres =CONFIG_VIDEO_YRES ; + *xres =CONFIG_VIDEO_XRES ; + *yres =CONFIG_VIDEO_YRES ;#else - xres =1024 ; - yres =768 ; + *xres =1024 ; + *yres =768 ;#endif pixel_format =0x88883316 ;debug ("mpc5121_diu_init\n" ); -return fsl_diu_init (xres, pixel_format,0 ); +return fsl_diu_init (*xres, pixel_format,0 ); } - -#if defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE ) - -/* -* The Graphic Device -*/ -GraphicDevice ctfb; -void *video_hw_init (void ) -{ -GraphicDevice *pGD = (GraphicDevice *) &ctfb; -struct fb_info *info; - -if (mpc5121_diu_init () <0 ) -return NULL ; - -/* fill in Graphic device struct */ -sprintf (pGD->modeIdent,"%dx%dx%d %dkHz %dHz" , - xres, yres,32 ,64 ,60 ); - - pGD->frameAdrs = (unsigned int )fsl_fb_open (&info); - pGD->winSizeX = xres; - pGD->winSizeY = yres; - pGD->plnSizeX = pGD->winSizeX; - pGD->plnSizeY = pGD->winSizeY; - - pGD->gdfBytesPP =4 ; - pGD->gdfIndex =GDF_32BIT_X888RGB ; - - pGD->isaBase =0 ; - pGD->pciBase =0 ; - pGD->memSize = info->screen_size; - -/* Cursor Start Address */ - pGD->dprBase =0 ; - pGD->vprBase =0 ; - pGD->cprBase =0 ; - -return (void *)pGD; -} - -#endif /* defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) */
board/davedenx/aria/aria.c +0 -5
@@ -119,11 +119,6 @@ int misc_init_r(void) tmp &0x000000FF ); -#ifdef CONFIG_FSL_DIU_FB -# if !(defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE )) -mpc5121_diu_init (); -# endif -#endif return 0 ; }
board/freescale/common/fsl_diu_fb.c +40 -1
50 lines not on this page · raw message
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +11 -63
111 lines not on this page · raw message
board/freescale/p1022ds/diu.c +7 -45
84 lines not on this page · raw message
board/pdm360ng/pdm360ng.c +0 -3
@@ -237,9 +237,6 @@ int misc_init_r(void)#endif #ifdef CONFIG_FSL_DIU_FB -# if !(defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE )) -mpc5121_diu_init (); -#endif #if defined(CONFIG_SERIAL_MULTI )set_lcd_brightness (0 );#endif
include/configs/MPC8610HPCD.h +3 -1
@@ -22,7 +22,9 @@#define CONFIG_FSL_DIU_FB 1/* FSL DIU */ /* video */ -#undef CONFIG_VIDEO +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_VIDEO +#endif #ifdef CONFIG_VIDEO #define CONFIG_CMD_BMP
include/configs/P1022DS.h +1 -1
@@ -178,7 +178,7 @@#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "/* Video */ -#undef CONFIG_FSL_DIU_FB +#define CONFIG_FSL_DIU_FB #ifdef CONFIG_FSL_DIU_FB #define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000)
include/fsl_diu_fb.h renamed from board/freescale/common/fsl_diu_fb.h +1 -0
@@ -57,3 +57,4 @@ struct fb_info {extern char *fsl_fb_open (struct fb_info **info);int fsl_diu_init (int xres,unsigned int pixel_format,int gamma_fix); +int platform_diu_init (unsigned int *xres,unsigned int *yres);
Signature · 1 line
1.7.0.4
PATCH 1/1 fsl_diu_fb: further refactoring of FLS DIU code
Quoted 6 lines · On Thu, 23 Sep 2010 01:57:16 +0200 Anatolij Gustschin <[email protected]> wrote:
This is the first patch version for testing on HW I do not have (mpc8610hpcd, p1022ds). Tested on pdm360ng board.
The patch will be modified to fix board config files as needed in the final version. We probably should also move
fsl_diu_fb.cfile to 'drivers/video'.
Note: This applies on top of your p1022ds video patch v2 applied to u-boot.git/next branch.
Thanks,
Anatolij
PATCH 1/1 fsl_diu_fb: further refactoring of FLS DIU code
In reply to Anatolij GustschinQuoted 6 lines · Anatolij Gustschin
This is the first patch version for testing on HW I do not have (mpc8610hpcd, p1022ds). Tested on pdm360ng board.
The patch will be modified to fix board config files as needed in the final version. We probably should also move
fsl_diu_fb.cfile to 'drivers/video'.
This works, except the default should be CONFIG_VIDEO is undefined. It's unlikely the customer will have a monitor connected to the DVI port.
So ...
include/configs/MPC8610HPCD.h line 27
Quoted 12 lines
include/configs/MPC8610HPCD.h +3
-1@@ -22,7 +22,9 @@#define CONFIG_FSL_DIU_FB 1/* FSL DIU */ /* video */ -#undef CONFIG_VIDEO +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_VIDEO +#endif
leave this undefined, and ...
include/configs/P1022DS.h line 181
Quoted 10 lines
include/configs/P1022DS.h +1
-1@@ -178,7 +178,7 @@#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "/* Video */ -#undef CONFIG_FSL_DIU_FB +#define CONFIG_FSL_DIU_FB
don't make this change.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH 1/1 fsl_diu_fb: further refactoring of FLS DIU code
Quoted 10 lines · On Thu, 23 Sep 2010 11:32:17 -0500 Timur Tabi <[email protected]> wrote:
Quoted 6 lines · Anatolij Gustschin
This is the first patch version for testing on HW I do not have (mpc8610hpcd, p1022ds). Tested on pdm360ng board.
The patch will be modified to fix board config files as needed in the final version. We probably should also move
fsl_diu_fb.cfile to 'drivers/video'.This works, except the default should be
CONFIG_VIDEOis undefined. It's unlikely the customer will have a monitor connected to the DVI port.
Ok, thanks.
Quoted 11 lines
include/configs/MPC8610HPCD.h line 27
Quoted 9 lines
+++
b/include/configs/MPC8610HPCD.hinclude/configs/MPC8610HPCD.h +3
-1@@ -22,7 +22,9 @@#define CONFIG_FSL_DIU_FB 1/* FSL DIU */ /* video */ -#undef CONFIG_VIDEO +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_VIDEO +#endif leave this undefined, and ...
Okay.
...
Quoted 9 lines
include/configs/P1022DS.h line 181
Quoted 7 lines
include/configs/P1022DS.h +2
-1+++ b/include/configs/P1022DS .h@@ -178,7 +178,7 @@#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "/* Video */ -#undef CONFIG_FSL_DIU_FB +#define CONFIG_FSL_DIU_FB don't make this change.
Yes. I enabled it for your test and will remove it.
Thanks,
Anatolij
PATCH v2 1/2 fsl_diu_fb: further refactoring of FSL DIU code
In reply to Timur TabiMove common code to the fsl_diu_fb.c file and remove obsolete code from board files (aria, mpc8610hpcd and pdm360ng). Move fsl_diu_fb.h file to the include directory.
---
v2:
- fixed commit message
- dropped p1022ds fixes as the cleaned up p1022ds video patch will be applied on top of this patch
- dropped unneeded board config file changes
arch/powerpc/cpu/mpc512x/diu.c | 62 ++----------------
board/davedenx/aria/aria.c | 5 --
board/freescale/common/fsl_diu_fb.c | 41 ++++++++++++-
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 74 +++------------------
board/pdm360ng/pdm360ng.c | 3 -
{board/freescale/common => include}/fsl_diu_fb.h | 1 +
6 files changed, 59 insertions(+), 127 deletions(-)
rename {board/freescale/common => include}/fsl_diu_fb.h (97%)arch/powerpc/cpu/mpc512x/diu.c +7 -55
@@ -27,17 +27,10 @@#include <command.h> #include <asm/io.h> -#include "../../../../board/freescale/common/fsl_diu_fb.h" - -#if defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE ) -#include <stdio_dev.h> -#include <video_fb.h> -#endif +#include <fsl_diu_fb.h> DECLARE_GLOBAL_DATA_PTR ; -static int xres, yres; -void diu_set_pixel_clock (unsigned int pixclock) {volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ;
@@ -58,61 +51,20 @@ void diu_set_pixel_clock(unsigned int pixclock)debug ("DIU: Modified value of CLKDVDR = 0x%08x\n" ,in_be32 (clkdvdr)); } -int mpc5121_diu_init (void ) +int platform_diu_init (unsigned int *xres,unsigned int *yres) {unsigned int pixel_format;#if defined(CONFIG_VIDEO_XRES ) & defined(CONFIG_VIDEO_YRES ) - xres =CONFIG_VIDEO_XRES ; - yres =CONFIG_VIDEO_YRES ; + *xres =CONFIG_VIDEO_XRES ; + *yres =CONFIG_VIDEO_YRES ;#else - xres =1024 ; - yres =768 ; + *xres =1024 ; + *yres =768 ;#endif pixel_format =0x88883316 ;debug ("mpc5121_diu_init\n" ); -return fsl_diu_init (xres, pixel_format,0 ); +return fsl_diu_init (*xres, pixel_format,0 ); } - -#if defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE ) - -/* -* The Graphic Device -*/ -GraphicDevice ctfb; -void *video_hw_init (void ) -{ -GraphicDevice *pGD = (GraphicDevice *) &ctfb; -struct fb_info *info; - -if (mpc5121_diu_init () <0 ) -return NULL ; - -/* fill in Graphic device struct */ -sprintf (pGD->modeIdent,"%dx%dx%d %dkHz %dHz" , - xres, yres,32 ,64 ,60 ); - - pGD->frameAdrs = (unsigned int )fsl_fb_open (&info); - pGD->winSizeX = xres; - pGD->winSizeY = yres; - pGD->plnSizeX = pGD->winSizeX; - pGD->plnSizeY = pGD->winSizeY; - - pGD->gdfBytesPP =4 ; - pGD->gdfIndex =GDF_32BIT_X888RGB ; - - pGD->isaBase =0 ; - pGD->pciBase =0 ; - pGD->memSize = info->screen_size; - -/* Cursor Start Address */ - pGD->dprBase =0 ; - pGD->vprBase =0 ; - pGD->cprBase =0 ; - -return (void *)pGD; -} - -#endif /* defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) */
board/davedenx/aria/aria.c +0 -5
@@ -119,11 +119,6 @@ int misc_init_r(void) tmp &0x000000FF ); -#ifdef CONFIG_FSL_DIU_FB -# if !(defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE )) -mpc5121_diu_init (); -# endif -#endif return 0 ; }
board/freescale/common/fsl_diu_fb.c +40 -1
50 lines not on this page · raw message
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +11 -63
111 lines not on this page · raw message
board/pdm360ng/pdm360ng.c +0 -3
@@ -237,9 +237,6 @@ int misc_init_r(void)#endif #ifdef CONFIG_FSL_DIU_FB -# if !(defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE )) -mpc5121_diu_init (); -#endif #if defined(CONFIG_SERIAL_MULTI )set_lcd_brightness (0 );#endif
include/fsl_diu_fb.h renamed from board/freescale/common/fsl_diu_fb.h +1 -0
@@ -57,3 +57,4 @@ struct fb_info {extern char *fsl_fb_open (struct fb_info **info);int fsl_diu_init (int xres,unsigned int pixel_format,int gamma_fix); +int platform_diu_init (unsigned int *xres,unsigned int *yres);
Signature · 1 line
1.7.0.4
PATCH v2 1/2 fsl_diu_fb: further refactoring of FSL DIU code
Quoted 12 lines · On Fri, 24 Sep 2010 07:27:21 +0200 Anatolij Gustschin <[email protected]> wrote:
Move common code to the
fsl_diu_fb.cfile and remove obsolete code from board files (aria, mpc8610hpcd and pdm360ng). Movefsl_diu_fb.hfile to the include directory.Signed-off-by Anatolij Gustschin <[email protected]>---
v2:
- fixed commit message
- dropped p1022ds fixes as the cleaned up p1022ds video patch will be applied on top of this patch
- dropped unneeded board config file changes
Quoted 8 lines
arch/powerpc/cpu/mpc512x/diu.c | 62 ++----------------
board/davedenx/aria/aria.c | 5 --
board/freescale/common/fsl_diu_fb.c | 41 ++++++++++++-
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 74 +++------------------
board/pdm360ng/pdm360ng.c | 3 -
{board/freescale/common => include}/fsl_diu_fb.h | 1 +
6 files changed, 59 insertions(+), 127 deletions(-)
rename {board/freescale/common => include}/fsl_diu_fb.h (97%)Applied to u-boot-video/next.
Anatolij
PATCH v2 2/2 p1022ds: add video support
In reply to Timur TabiFrom: Timur Tabi <[email protected]>
Add support for the DIU controller. If CONFIG_VIDEO is defined, then the console will appear on a DVI monitor instead of the serial port.
---
v2:
- rebased on top of FSL DIU code refactoring patch to avoid some code duplication.
board/freescale/p1022ds/Makefile | 2 + board/freescale/p1022ds/diu.c | 110 ++++++++++++++++++++++++++++++++++++++ include/configs/P1022DS.h | 13 +++-- 3 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 board/freescale/p1022ds/diu.c
board/freescale/p1022ds/Makefile +2 -0
@@ -16,6 +16,8 @@ COBJS-y += ddr.o COBJS-y += law.o COBJS-y += tlb.o +COBJS-$(CONFIG_FSL_DIU_FB) += diu.o + SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) SOBJS := $(addprefix $(obj),$(SOBJS))
board/freescale/p1022ds/diu.c new file +110 -0
110 lines not on this page · raw message
include/configs/P1022DS.h +8 -5
@@ -177,14 +177,17 @@#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_FSL_DIU_FB -#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) -/* Video */ -/* #define CONFIG_VIDEO */ -#ifdef CONFIG_VIDEO +#undef CONFIG_FSL_DIU_FB + +#ifdef CONFIG_FSL_DIU_FB +#define CONFIG_SYS_DIU_ADDR (CONFIG_SYS_CCSRBAR + 0x10000) +#define CONFIG_VIDEO +#define CONFIG_CMD_BMP #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_BMP_LOGO #endif /*
Signature · 1 line
1.7.0.4
PATCH v2 2/2 p1022ds: add video support
Quoted 12 lines · On Fri, 24 Sep 2010 07:27:22 +0200 Anatolij Gustschin <[email protected]> wrote:
From: Timur Tabi <[email protected]>
Add support for the DIU controller. If
CONFIG_VIDEOis defined, then the console will appear on a DVI monitor instead of the serial port.Signed-off-by Timur Tabi <[email protected]>Signed-off-by Anatolij Gustschin <[email protected]>---
v2:
- rebased on top of FSL DIU code refactoring patch to avoid some code duplication.
Quoted 5 lines
board/freescale/p1022ds/Makefile | 2 + board/freescale/p1022ds/diu.c | 110 ++++++++++++++++++++++++++++++++++++++ include/configs/P1022DS.h | 13 +++-- 3 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 board/freescale/p1022ds/diu.c
Applied to u-boot-video/next.
Anatolij