Modifications to video-related files for RRvision.
PATCH 1/1 Modifications to video-related files for RRvision.
Note that the LOGO_X/LOG_Y macros are defined in RRvision.h to center the logo on the screen and might be useful for other boards.
--- common/lcd.c | 9 +++- cpu/mpc8xx/lcd.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++--- cpu/mpc8xx/video.c | 22 ++++++++- 3 files changed, 159 insertions(+), 10 deletions(-)
common/lcd.c +8 -1
@@ -70,6 +70,13 @@# if (CONSOLE_COLOR_WHITE >=BMP_LOGO_OFFSET )# error Default Color Map overlaps with Logo Color Map# endif + +# ifndef CONFIG_LCD_LOGO_X +# define CONFIG_LCD_LOGO_X 0 +# endif +# ifndef CONFIG_LCD_LOGO_Y +# define CONFIG_LCD_LOGO_Y 0 +# endif #endif DECLARE_GLOBAL_DATA_PTR ;
@@ -768,7 +775,7 @@ static void *lcd_logo (void)#endif /* CONFIG_SPLASH_SCREEN */ #ifdef CONFIG_LCD_LOGO -bitmap_plot (0 ,0 ); +bitmap_plot (CONFIG_LCD_LOGO_X ,CONFIG_LCD_LOGO_Y );#endif /* CONFIG_LCD_LOGO */ #ifdef CONFIG_MPC823
cpu/mpc8xx/lcd.c +131 -7
197 lines not on this page · raw message
cpu/mpc8xx/video.c +20 -2
@@ -68,6 +68,10 @@ DECLARE_GLOBAL_DATA_PTR;#define VIDEO_INFO_X VIDEO_LOGO_WIDTH+8#define VIDEO_INFO_Y 16 +#if defined(CONFIG_RRVISION ) && defined(TTTECH_NO_SCREEN_INFO ) +#undef VIDEO_INFO +#endif +/************************************************************************/ /* ** VIDEO ENCODER CONSTANTS */ /************************************************************************/
@@ -115,10 +119,15 @@ DECLARE_GLOBAL_DATA_PTR;#define VIDEO_BURST_LEN (VIDEO_COLS/8)#ifdef VIDEO_MODE_YUYV + +#if defined(CONFIG_RRVISION ) +#define VIDEO_BG_COL 0x80108010/* Background color in YUYV format */ +#else #define VIDEO_BG_COL 0x80D880D8/* Background color in YUYV format */ +#endif /* CONFIG_RRVISION */ #else #define VIDEO_BG_COL 0xF8F8F8F8/* Background color in RGB format */ -#endif +#endif /* VIDEO_MODE_YUYV */ /************************************************************************/ /* ** FONT AND LOGO DATA */
@@ -132,6 +141,14 @@ DECLARE_GLOBAL_DATA_PTR;#define VIDEO_LOGO_WIDTH DEF_U_BOOT_LOGO_WIDTH#define VIDEO_LOGO_HEIGHT DEF_U_BOOT_LOGO_HEIGHT#define VIDEO_LOGO_ADDR &u_boot_logo + +#ifndef CONFIG_VIDEO_LOGO_X +#define CONFIG_VIDEO_LOGO_X 0 +#endif +#ifndef CONFIG_VIDEO_LOGO_Y +#define CONFIG_VIDEO_LOGO_Y 0 +#endif +#endif /************************************************************************/
@@ -1171,7 +1188,8 @@ static void *video_logo (void)char info[80 ];#endif /* VIDEO_INFO */ -easylogo_plot (VIDEO_LOGO_ADDR , screen, width,0 ,0 ); +easylogo_plot (VIDEO_LOGO_ADDR , screen, width,CONFIG_VIDEO_LOGO_X , +CONFIG_VIDEO_LOGO_Y );#ifdef VIDEO_INFO sprintf (info,"%s (%s - %s) " ,U_BOOT_VERSION , __DATE__, __TIME__);
Signature · 5 lines
1.5.4.3 --- Gary Jennejohn
PATCH 1/1 Modifications to video-related files for RRvision.
Quoted 4 lines · Gary Jennejohn
Note that the LOGO_X/LOG_Y macros are defined in
RRvision.hto center the logo on the screen and might be useful for other boards.Signed-off-by Gary Jennejohn <[email protected]>
Nak. This is a multi-patch.
Please provide a patch for the LOGO_X/LOG_Y macros and a patch for RRvision board, then send the first to me and the second to the proper maintainer.
Also you have to update the README file by describing the new macros.
Ciao,
Rodolfo
Signature · 4 lines
GNU/Linux Solutions e-mail: giometti at enneenne.com Linux Device Driver giometti at linux.it Embedded Systems phone: +39 349 2432127 UNIX programming skype: rodolfo.giometti
PATCH 1/1 Modifications to video-related files for RRvision.
Quoted 6 lines · On Tue, 24 Jun 2008 14:14:23 +0200 Rodolfo Giometti <[email protected]>…
Quoted 4 lines · Gary Jennejohn
Note that the LOGO_X/LOG_Y macros are defined in
RRvision.hto center the logo on the screen and might be useful for other boards.Signed-off-by Gary Jennejohn <[email protected]>
Quoted 6 lines
Nak. This is a multi-patch.
Please provide a patch for the LOGO_X/LOG_Y macros and a patch for RRvision board, then send the first to me and the second to the proper maintainer.
Wolfgang Denk imformed me that the lcd/video patches had to go to the proper custodian and I only found your name listed for video.
So, who _is_ the proper target for this stuff? Wolfgang doesn't want to see it.
Quoted 2 lines
Also you have to update the README file by describing the new macros.
OK
---
Gary Jennejohn
*********************************************************************
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
*********************************************************************
PATCH 1/1 Modifications to video-related files for RRvision.
Quoted 16 lines · Gary Jennejohn
Quoted 6 lines · On Tue, 24 Jun 2008 14:14:23 +0200 Rodolfo Giometti <[email protected]>…
Quoted 4 lines · Gary Jennejohn
Note that the LOGO_X/LOG_Y macros are defined in
RRvision.hto center the logo on the screen and might be useful for other boards.Signed-off-by Gary Jennejohn <[email protected]>Quoted 6 lines
Nak. This is a multi-patch.
Please provide a patch for the LOGO_X/LOG_Y macros and a patch for RRvision board, then send the first to me and the second to the proper maintainer.
Quoted 5 lines
Wolfgang Denk imformed me that the lcd/video patches had to go to the proper custodian and I only found your name listed for video.
So, who _is_ the proper target for this stuff? Wolfgang doesn't want to see it.
I'm the video custodian, so I can decide about lcd/video stuff, regarding specific boards modifications you should check the custodians list.
Ciao,
Rodolfo
Signature · 4 lines
GNU/Linux Solutions e-mail: giometti at enneenne.com Linux Device Driver giometti at linux.it Embedded Systems phone: +39 349 2432127 UNIX programming skype: rodolfo.giometti
PATCH 1/1 Modifications to video-related files for RRvision.
Hi Rodolfo,
Quoted 20 lines · Gary Jennejohn
Quoted 19 lines
Quoted 6 lines · On Tue, 24 Jun 2008 14:14:23 +0200 Rodolfo Giometti <[email protected]>…
Quoted 4 lines · Gary Jennejohn
Note that the LOGO_X/LOG_Y macros are defined in
RRvision.hto center the logo on the screen and might be useful for other boards.Signed-off-by Gary Jennejohn <[email protected]>Quoted 6 lines
Nak. This is a multi-patch.
Please provide a patch for the LOGO_X/LOG_Y macros and a patch for RRvision board, then send the first to me and the second to the proper maintainer.
Wolfgang Denk imformed me that the lcd/video patches had to go to the proper custodian and I only found your name listed for video.
Quoted 6 lines
Quoted 2 lines
So, who _is_ the proper target for this stuff? Wolfgang doesn't want to see it.
I'm the video custodian, so I can decide about lcd/video stuff, regarding specific boards modifications you should check the custodians list.
Can you explain that to me? Gary changes three files:
common/lcd.c | 9 +++- cpu/mpc8xx/lcd.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++--- cpu/mpc8xx/video.c | 22 ++++++++- 3 files changed, 159 insertions(+), 10 deletions(-)
None of this is specific to a board but really concerns lcd and video handling. If you don't feel responsible for it, the only other custodian could be the 8xx custodian. But he already pointed Gary to you ;)
So please, if nobody from the 8xx front NAKs the patches, pull it into your custodian repository.
Thanks
Detlev
Signature · 7 lines
The continental people think life is a game. The English think
cricket is a game.
-- George Mikes
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de