* [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes
@ 2013-06-17 18:31 Robert Winkler
2013-06-17 18:31 ` [U-Boot] [PATCH 1/3 v2] video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO Robert Winkler
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Robert Winkler @ 2013-06-17 18:31 UTC (permalink / raw)
To: u-boot
The first 2 patches are the result of discussion in these threads:
http://lists.denx.de/pipermail/u-boot/2013-May/155463.html
http://lists.denx.de/pipermail/u-boot/2013-June/155630.html
http://lists.denx.de/pipermail/u-boot/2013-June/155632.html
The upshot is, move splash_screen_prepare to a common location
so it can be used in cfb_console.c and (possibly) make it weak.
The first patch can be accepted without the last two. The third
patch is a fix for cm_t35 that's only necessary if we make it weak.
Robert Winkler (3):
video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO
video: lcd: Make splash_screen_prepare weak, remove config macro
omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare
README | 8 --------
board/compulab/cm_t35/cm_t35.c | 2 +-
common/Makefile | 1 +
common/lcd.c | 16 +++-------------
common/splash.c | 31 +++++++++++++++++++++++++++++++
doc/README.splashprepare | 8 ++++++++
drivers/video/cfb_console.c | 5 +++--
include/configs/cm_t35.h | 1 -
include/lcd.h | 1 -
include/splash.h | 29 +++++++++++++++++++++++++++++
10 files changed, 76 insertions(+), 26 deletions(-)
create mode 100644 common/splash.c
create mode 100644 doc/README.splashprepare
create mode 100644 include/splash.h
--
1.8.3
^ permalink raw reply [flat|nested] 11+ messages in thread* [U-Boot] [PATCH 1/3 v2] video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO 2013-06-17 18:31 [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler @ 2013-06-17 18:31 ` Robert Winkler 2013-06-18 6:23 ` Igor Grinberg 2013-06-17 18:31 ` [U-Boot] [PATCH 2/3] video: lcd: Make splash_screen_prepare weak, remove config macro Robert Winkler ` (2 subsequent siblings) 3 siblings, 1 reply; 11+ messages in thread From: Robert Winkler @ 2013-06-17 18:31 UTC (permalink / raw) To: u-boot Create splash.c/h to put the function and any future common splash screen code in. Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> --- v2 changes: remove superfluous comments remove debug printf that slipped in remove address from GPL comments common/Makefile | 1 + common/lcd.c | 16 +++------------- common/splash.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/video/cfb_console.c | 5 +++-- include/lcd.h | 1 - include/splash.h | 29 +++++++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 16 deletions(-) create mode 100644 common/splash.c create mode 100644 include/splash.h diff --git a/common/Makefile b/common/Makefile index 1cfb132..b48f227 100644 --- a/common/Makefile +++ b/common/Makefile @@ -204,6 +204,7 @@ COBJS-y += flash.o COBJS-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o COBJS-$(CONFIG_I2C_EDID) += edid.o COBJS-$(CONFIG_KALLSYMS) += kallsyms.o +COBJS-y += splash.o COBJS-$(CONFIG_LCD) += lcd.o COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o COBJS-$(CONFIG_MENU) += menu.o diff --git a/common/lcd.c b/common/lcd.c index edae835..72ffcfb 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -43,6 +43,8 @@ #include <lcd.h> #include <watchdog.h> +#include <splash.h> + #if defined(CONFIG_CPU_PXA25X) || defined(CONFIG_CPU_PXA27X) || \ defined(CONFIG_CPU_MONAHANS) #define CONFIG_CPU_PXA @@ -1068,18 +1070,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) } #endif -#ifdef CONFIG_SPLASH_SCREEN_PREPARE -static inline int splash_screen_prepare(void) -{ - return board_splash_screen_prepare(); -} -#else -static inline int splash_screen_prepare(void) -{ - return 0; -} -#endif - static void *lcd_logo(void) { #ifdef CONFIG_SPLASH_SCREEN @@ -1092,7 +1082,7 @@ static void *lcd_logo(void) do_splash = 0; if (splash_screen_prepare()) - return (void *)gd->fb_base; + return (void *)lcd_base; addr = simple_strtoul (s, NULL, 16); #ifdef CONFIG_SPLASH_SCREEN_ALIGN diff --git a/common/splash.c b/common/splash.c new file mode 100644 index 0000000..98de2be --- /dev/null +++ b/common/splash.c @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., http://www.fsf.org/about/contact/ + * + */ + +#include <splash.h> +#include <config.h> + +#ifdef CONFIG_SPLASH_SCREEN_PREPARE +int splash_screen_prepare(void) +{ + return board_splash_screen_prepare(); +} +#else +int splash_screen_prepare(void) +{ + return 0; +} +#endif diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 0793f07..4e299c6 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -181,6 +181,8 @@ */ #include <video_fb.h> +#include <splash.h> + /* * some Macros */ @@ -1995,10 +1997,9 @@ static void *video_logo(void) #ifdef CONFIG_SPLASH_SCREEN s = getenv("splashimage"); if (s != NULL) { - + splash_screen_prepare(); addr = simple_strtoul(s, NULL, 16); - if (video_display_bitmap(addr, video_logo_xpos, video_logo_ypos) == 0) { diff --git a/include/lcd.h b/include/lcd.h index c6e7fc5..e58ffd0 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -37,7 +37,6 @@ extern struct vidinfo panel_info; void lcd_ctrl_init(void *lcdbase); void lcd_enable(void); -int board_splash_screen_prepare(void); /* setcolreg used in 8bpp/16bpp; initcolregs used in monochrome */ void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue); diff --git a/include/splash.h b/include/splash.h new file mode 100644 index 0000000..63b45e0 --- /dev/null +++ b/include/splash.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., http://www.fsf.org/about/contact/ + */ + +#ifndef _SPLASH_H_ +#define _SPLASH_H_ + + +int splash_screen_prepare(void); + + +#endif -- 1.8.3 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 1/3 v2] video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO 2013-06-17 18:31 ` [U-Boot] [PATCH 1/3 v2] video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO Robert Winkler @ 2013-06-18 6:23 ` Igor Grinberg 0 siblings, 0 replies; 11+ messages in thread From: Igor Grinberg @ 2013-06-18 6:23 UTC (permalink / raw) To: u-boot Hi Robert, On 06/17/13 21:31, Robert Winkler wrote: > Create splash.c/h to put the function and any future common splash > screen code in. > > Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il> > --- > v2 changes: > remove superfluous comments > remove debug printf that slipped in > remove address from GPL comments > > common/Makefile | 1 + > common/lcd.c | 16 +++------------- > common/splash.c | 36 ++++++++++++++++++++++++++++++++++++ > drivers/video/cfb_console.c | 5 +++-- > include/lcd.h | 1 - > include/splash.h | 29 +++++++++++++++++++++++++++++ > 6 files changed, 72 insertions(+), 16 deletions(-) > create mode 100644 common/splash.c > create mode 100644 include/splash.h > > diff --git a/common/Makefile b/common/Makefile > index 1cfb132..b48f227 100644 > --- a/common/Makefile > +++ b/common/Makefile > @@ -204,6 +204,7 @@ COBJS-y += flash.o > COBJS-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o > COBJS-$(CONFIG_I2C_EDID) += edid.o > COBJS-$(CONFIG_KALLSYMS) += kallsyms.o > +COBJS-y += splash.o > COBJS-$(CONFIG_LCD) += lcd.o > COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o > COBJS-$(CONFIG_MENU) += menu.o > diff --git a/common/lcd.c b/common/lcd.c > index edae835..72ffcfb 100644 > --- a/common/lcd.c > +++ b/common/lcd.c > @@ -43,6 +43,8 @@ > #include <lcd.h> > #include <watchdog.h> > > +#include <splash.h> > + > #if defined(CONFIG_CPU_PXA25X) || defined(CONFIG_CPU_PXA27X) || \ > defined(CONFIG_CPU_MONAHANS) > #define CONFIG_CPU_PXA > @@ -1068,18 +1070,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) > } > #endif > > -#ifdef CONFIG_SPLASH_SCREEN_PREPARE > -static inline int splash_screen_prepare(void) > -{ > - return board_splash_screen_prepare(); > -} > -#else > -static inline int splash_screen_prepare(void) > -{ > - return 0; > -} > -#endif > - > static void *lcd_logo(void) > { > #ifdef CONFIG_SPLASH_SCREEN > @@ -1092,7 +1082,7 @@ static void *lcd_logo(void) > do_splash = 0; > > if (splash_screen_prepare()) > - return (void *)gd->fb_base; > + return (void *)lcd_base; > > addr = simple_strtoul (s, NULL, 16); > #ifdef CONFIG_SPLASH_SCREEN_ALIGN > diff --git a/common/splash.c b/common/splash.c > new file mode 100644 > index 0000000..98de2be > --- /dev/null > +++ b/common/splash.c > @@ -0,0 +1,36 @@ > +/* > + * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., http://www.fsf.org/about/contact/ > + * > + */ > + > +#include <splash.h> > +#include <config.h> > + > +#ifdef CONFIG_SPLASH_SCREEN_PREPARE > +int splash_screen_prepare(void) > +{ > + return board_splash_screen_prepare(); > +} > +#else > +int splash_screen_prepare(void) > +{ > + return 0; > +} > +#endif > diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c > index 0793f07..4e299c6 100644 > --- a/drivers/video/cfb_console.c > +++ b/drivers/video/cfb_console.c > @@ -181,6 +181,8 @@ > */ > #include <video_fb.h> > > +#include <splash.h> > + > /* > * some Macros > */ > @@ -1995,10 +1997,9 @@ static void *video_logo(void) > #ifdef CONFIG_SPLASH_SCREEN > s = getenv("splashimage"); > if (s != NULL) { > - > + splash_screen_prepare(); > addr = simple_strtoul(s, NULL, 16); > > - > if (video_display_bitmap(addr, > video_logo_xpos, > video_logo_ypos) == 0) { > diff --git a/include/lcd.h b/include/lcd.h > index c6e7fc5..e58ffd0 100644 > --- a/include/lcd.h > +++ b/include/lcd.h > @@ -37,7 +37,6 @@ extern struct vidinfo panel_info; > > void lcd_ctrl_init(void *lcdbase); > void lcd_enable(void); > -int board_splash_screen_prepare(void); > > /* setcolreg used in 8bpp/16bpp; initcolregs used in monochrome */ > void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue); > diff --git a/include/splash.h b/include/splash.h > new file mode 100644 > index 0000000..63b45e0 > --- /dev/null > +++ b/include/splash.h > @@ -0,0 +1,29 @@ > +/* > + * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., http://www.fsf.org/about/contact/ > + */ > + > +#ifndef _SPLASH_H_ > +#define _SPLASH_H_ > + > + > +int splash_screen_prepare(void); > + > + > +#endif > -- Regards, Igor. ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 2/3] video: lcd: Make splash_screen_prepare weak, remove config macro 2013-06-17 18:31 [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler 2013-06-17 18:31 ` [U-Boot] [PATCH 1/3 v2] video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO Robert Winkler @ 2013-06-17 18:31 ` Robert Winkler 2013-06-18 6:24 ` Igor Grinberg 2013-06-17 18:31 ` [U-Boot] [PATCH 3/3] omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare Robert Winkler 2013-06-26 23:00 ` [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler 3 siblings, 1 reply; 11+ messages in thread From: Robert Winkler @ 2013-06-17 18:31 UTC (permalink / raw) To: u-boot Remove CONFIG_SPLASH_SCREEN_PREPARE from README Add doc/README.splashprepare to document functionality Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> --- README | 8 -------- common/splash.c | 13 ++++--------- doc/README.splashprepare | 8 ++++++++ 3 files changed, 12 insertions(+), 17 deletions(-) create mode 100644 doc/README.splashprepare diff --git a/README b/README index b72ab2f..0686073 100644 --- a/README +++ b/README @@ -1605,14 +1605,6 @@ CBFS (Coreboot Filesystem) support => vertically centered image at x = dspWidth - bmpWidth - 9 - CONFIG_SPLASH_SCREEN_PREPARE - - If this option is set then the board_splash_screen_prepare() - function, which must be defined in your code, is called as part - of the splash screen display sequence. It gives the board an - opportunity to prepare the splash image data before it is - processed and sent to the frame buffer by U-Boot. - - Gzip compressed BMP image support: CONFIG_VIDEO_BMP_GZIP If this option is set, additionally to standard BMP diff --git a/common/splash.c b/common/splash.c index 98de2be..1882e5f 100644 --- a/common/splash.c +++ b/common/splash.c @@ -21,16 +21,11 @@ */ #include <splash.h> -#include <config.h> -#ifdef CONFIG_SPLASH_SCREEN_PREPARE -int splash_screen_prepare(void) -{ - return board_splash_screen_prepare(); -} -#else -int splash_screen_prepare(void) +int __splash_screen_prepare(void) { return 0; } -#endif + +int splash_screen_prepare(void) + __attribute__ ((weak, alias("__splash_screen_prepare"))); diff --git a/doc/README.splashprepare b/doc/README.splashprepare new file mode 100644 index 0000000..61b4ec5 --- /dev/null +++ b/doc/README.splashprepare @@ -0,0 +1,8 @@ +--------------------------------------------------------------------- +Splash Screen +--------------------------------------------------------------------- +The splash_screen_prepare() function is a weak function defined in +common/splash.c. It is called as part of the splash screen display +sequence. It gives the board an opportunity to prepare the splash +image data before it is processed and sent to the frame buffer by +U-Boot. Define your own version to use this feature. -- 1.8.3 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 2/3] video: lcd: Make splash_screen_prepare weak, remove config macro 2013-06-17 18:31 ` [U-Boot] [PATCH 2/3] video: lcd: Make splash_screen_prepare weak, remove config macro Robert Winkler @ 2013-06-18 6:24 ` Igor Grinberg 0 siblings, 0 replies; 11+ messages in thread From: Igor Grinberg @ 2013-06-18 6:24 UTC (permalink / raw) To: u-boot On 06/17/13 21:31, Robert Winkler wrote: > Remove CONFIG_SPLASH_SCREEN_PREPARE from README > Add doc/README.splashprepare to document functionality > > Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il> > --- > README | 8 -------- > common/splash.c | 13 ++++--------- > doc/README.splashprepare | 8 ++++++++ > 3 files changed, 12 insertions(+), 17 deletions(-) > create mode 100644 doc/README.splashprepare > > diff --git a/README b/README > index b72ab2f..0686073 100644 > --- a/README > +++ b/README > @@ -1605,14 +1605,6 @@ CBFS (Coreboot Filesystem) support > => vertically centered image > at x = dspWidth - bmpWidth - 9 > > - CONFIG_SPLASH_SCREEN_PREPARE > - > - If this option is set then the board_splash_screen_prepare() > - function, which must be defined in your code, is called as part > - of the splash screen display sequence. It gives the board an > - opportunity to prepare the splash image data before it is > - processed and sent to the frame buffer by U-Boot. > - > - Gzip compressed BMP image support: CONFIG_VIDEO_BMP_GZIP > > If this option is set, additionally to standard BMP > diff --git a/common/splash.c b/common/splash.c > index 98de2be..1882e5f 100644 > --- a/common/splash.c > +++ b/common/splash.c > @@ -21,16 +21,11 @@ > */ > > #include <splash.h> > -#include <config.h> > > -#ifdef CONFIG_SPLASH_SCREEN_PREPARE > -int splash_screen_prepare(void) > -{ > - return board_splash_screen_prepare(); > -} > -#else > -int splash_screen_prepare(void) > +int __splash_screen_prepare(void) > { > return 0; > } > -#endif > + > +int splash_screen_prepare(void) > + __attribute__ ((weak, alias("__splash_screen_prepare"))); > diff --git a/doc/README.splashprepare b/doc/README.splashprepare > new file mode 100644 > index 0000000..61b4ec5 > --- /dev/null > +++ b/doc/README.splashprepare > @@ -0,0 +1,8 @@ > +--------------------------------------------------------------------- > +Splash Screen > +--------------------------------------------------------------------- > +The splash_screen_prepare() function is a weak function defined in > +common/splash.c. It is called as part of the splash screen display > +sequence. It gives the board an opportunity to prepare the splash > +image data before it is processed and sent to the frame buffer by > +U-Boot. Define your own version to use this feature. > -- Regards, Igor. ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare 2013-06-17 18:31 [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler 2013-06-17 18:31 ` [U-Boot] [PATCH 1/3 v2] video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO Robert Winkler 2013-06-17 18:31 ` [U-Boot] [PATCH 2/3] video: lcd: Make splash_screen_prepare weak, remove config macro Robert Winkler @ 2013-06-17 18:31 ` Robert Winkler 2013-06-18 6:26 ` Igor Grinberg 2013-06-26 23:00 ` [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler 3 siblings, 1 reply; 11+ messages in thread From: Robert Winkler @ 2013-06-17 18:31 UTC (permalink / raw) To: u-boot Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> --- board/compulab/cm_t35/cm_t35.c | 2 +- include/configs/cm_t35.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c index b0b80e5..95098af 100644 --- a/board/compulab/cm_t35/cm_t35.c +++ b/board/compulab/cm_t35/cm_t35.c @@ -120,7 +120,7 @@ static inline int splash_load_from_nand(void) } #endif /* CONFIG_CMD_NAND */ -int board_splash_screen_prepare(void) +int splash_screen_prepare(void) { char *env_splashimage_value; u32 bmp_load_addr; diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index c6e357a..b258da9 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -339,6 +339,5 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP -#define CONFIG_SPLASH_SCREEN_PREPARE #endif /* __CONFIG_H */ -- 1.8.3 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare 2013-06-17 18:31 ` [U-Boot] [PATCH 3/3] omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare Robert Winkler @ 2013-06-18 6:26 ` Igor Grinberg 2013-06-18 16:28 ` Robert Winkler 0 siblings, 1 reply; 11+ messages in thread From: Igor Grinberg @ 2013-06-18 6:26 UTC (permalink / raw) To: u-boot On 06/17/13 21:31, Robert Winkler wrote: > Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> Usually, we add something to the commit message, otherwise Acked-by: Igor Grinberg <grinberg@compulab.co.il> > --- > board/compulab/cm_t35/cm_t35.c | 2 +- > include/configs/cm_t35.h | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c > index b0b80e5..95098af 100644 > --- a/board/compulab/cm_t35/cm_t35.c > +++ b/board/compulab/cm_t35/cm_t35.c > @@ -120,7 +120,7 @@ static inline int splash_load_from_nand(void) > } > #endif /* CONFIG_CMD_NAND */ > > -int board_splash_screen_prepare(void) > +int splash_screen_prepare(void) > { > char *env_splashimage_value; > u32 bmp_load_addr; > diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h > index c6e357a..b258da9 100644 > --- a/include/configs/cm_t35.h > +++ b/include/configs/cm_t35.h > @@ -339,6 +339,5 @@ > #define CONFIG_SPLASH_SCREEN > #define CONFIG_CMD_BMP > #define CONFIG_BMP_16BPP > -#define CONFIG_SPLASH_SCREEN_PREPARE > > #endif /* __CONFIG_H */ > -- Regards, Igor. ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare 2013-06-18 6:26 ` Igor Grinberg @ 2013-06-18 16:28 ` Robert Winkler 2013-06-19 5:38 ` Igor Grinberg 0 siblings, 1 reply; 11+ messages in thread From: Robert Winkler @ 2013-06-18 16:28 UTC (permalink / raw) To: u-boot I figured this one was so simple it didn't warrant anything more than what's already in the subject line. On Mon, Jun 17, 2013 at 11:26 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: > > On 06/17/13 21:31, Robert Winkler wrote: >> Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> > > Usually, we add something to the commit message, otherwise > Acked-by: Igor Grinberg <grinberg@compulab.co.il> > >> --- >> board/compulab/cm_t35/cm_t35.c | 2 +- >> include/configs/cm_t35.h | 1 - >> 2 files changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c >> index b0b80e5..95098af 100644 >> --- a/board/compulab/cm_t35/cm_t35.c >> +++ b/board/compulab/cm_t35/cm_t35.c >> @@ -120,7 +120,7 @@ static inline int splash_load_from_nand(void) >> } >> #endif /* CONFIG_CMD_NAND */ >> >> -int board_splash_screen_prepare(void) >> +int splash_screen_prepare(void) >> { >> char *env_splashimage_value; >> u32 bmp_load_addr; >> diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h >> index c6e357a..b258da9 100644 >> --- a/include/configs/cm_t35.h >> +++ b/include/configs/cm_t35.h >> @@ -339,6 +339,5 @@ >> #define CONFIG_SPLASH_SCREEN >> #define CONFIG_CMD_BMP >> #define CONFIG_BMP_16BPP >> -#define CONFIG_SPLASH_SCREEN_PREPARE >> >> #endif /* __CONFIG_H */ >> > > -- > Regards, > Igor. ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/3] omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare 2013-06-18 16:28 ` Robert Winkler @ 2013-06-19 5:38 ` Igor Grinberg 0 siblings, 0 replies; 11+ messages in thread From: Igor Grinberg @ 2013-06-19 5:38 UTC (permalink / raw) To: u-boot On 06/18/13 19:28, Robert Winkler wrote: > I figured this one was so simple it didn't warrant anything more than > what's already in the subject line. Yes, that's understood. There are plenty of simple patches, but still it is a good practice to have even a minimal commit message. > > On Mon, Jun 17, 2013 at 11:26 PM, Igor Grinberg <grinberg@compulab.co.il> wrote: >> >> On 06/17/13 21:31, Robert Winkler wrote: >>> Signed-off-by: Robert Winkler <robert.winkler@boundarydevices.com> >> >> Usually, we add something to the commit message, otherwise >> Acked-by: Igor Grinberg <grinberg@compulab.co.il> >> >>> --- >>> board/compulab/cm_t35/cm_t35.c | 2 +- >>> include/configs/cm_t35.h | 1 - >>> 2 files changed, 1 insertion(+), 2 deletions(-) >>> >>> diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c >>> index b0b80e5..95098af 100644 >>> --- a/board/compulab/cm_t35/cm_t35.c >>> +++ b/board/compulab/cm_t35/cm_t35.c >>> @@ -120,7 +120,7 @@ static inline int splash_load_from_nand(void) >>> } >>> #endif /* CONFIG_CMD_NAND */ >>> >>> -int board_splash_screen_prepare(void) >>> +int splash_screen_prepare(void) >>> { >>> char *env_splashimage_value; >>> u32 bmp_load_addr; >>> diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h >>> index c6e357a..b258da9 100644 >>> --- a/include/configs/cm_t35.h >>> +++ b/include/configs/cm_t35.h >>> @@ -339,6 +339,5 @@ >>> #define CONFIG_SPLASH_SCREEN >>> #define CONFIG_CMD_BMP >>> #define CONFIG_BMP_16BPP >>> -#define CONFIG_SPLASH_SCREEN_PREPARE >>> >>> #endif /* __CONFIG_H */ >>> >> >> -- >> Regards, >> Igor. > -- Regards, Igor. ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes 2013-06-17 18:31 [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler ` (2 preceding siblings ...) 2013-06-17 18:31 ` [U-Boot] [PATCH 3/3] omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare Robert Winkler @ 2013-06-26 23:00 ` Robert Winkler 2013-07-01 19:57 ` Anatolij Gustschin 3 siblings, 1 reply; 11+ messages in thread From: Robert Winkler @ 2013-06-26 23:00 UTC (permalink / raw) To: u-boot Hello all, I haven't heard from anyone but Igor. Does that mean it looks good? Robert On Mon, Jun 17, 2013 at 11:31 AM, Robert Winkler < robert.winkler@boundarydevices.com> wrote: > The first 2 patches are the result of discussion in these threads: > http://lists.denx.de/pipermail/u-boot/2013-May/155463.html > http://lists.denx.de/pipermail/u-boot/2013-June/155630.html > http://lists.denx.de/pipermail/u-boot/2013-June/155632.html > > The upshot is, move splash_screen_prepare to a common location > so it can be used in cfb_console.c and (possibly) make it weak. > > The first patch can be accepted without the last two. The third > patch is a fix for cm_t35 that's only necessary if we make it weak. > > Robert Winkler (3): > video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO > video: lcd: Make splash_screen_prepare weak, remove config macro > omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare > > README | 8 -------- > board/compulab/cm_t35/cm_t35.c | 2 +- > common/Makefile | 1 + > common/lcd.c | 16 +++------------- > common/splash.c | 31 +++++++++++++++++++++++++++++++ > doc/README.splashprepare | 8 ++++++++ > drivers/video/cfb_console.c | 5 +++-- > include/configs/cm_t35.h | 1 - > include/lcd.h | 1 - > include/splash.h | 29 +++++++++++++++++++++++++++++ > 10 files changed, 76 insertions(+), 26 deletions(-) > create mode 100644 common/splash.c > create mode 100644 doc/README.splashprepare > create mode 100644 include/splash.h > > -- > 1.8.3 > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes 2013-06-26 23:00 ` [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler @ 2013-07-01 19:57 ` Anatolij Gustschin 0 siblings, 0 replies; 11+ messages in thread From: Anatolij Gustschin @ 2013-07-01 19:57 UTC (permalink / raw) To: u-boot Hello Robert, On Wed, 26 Jun 2013 16:00:20 -0700 Robert Winkler <robert.winkler@boundarydevices.com> wrote: > Hello all, > > I haven't heard from anyone but Igor. Does that mean it looks good? Sorry for delay, I've applied this series now. Thanks! Anatolij ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-07-01 19:57 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-06-17 18:31 [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler 2013-06-17 18:31 ` [U-Boot] [PATCH 1/3 v2] video: lcd: Add CONFIG_SPLASH_SCREEN_PREPARE support to CONFIG_VIDEO Robert Winkler 2013-06-18 6:23 ` Igor Grinberg 2013-06-17 18:31 ` [U-Boot] [PATCH 2/3] video: lcd: Make splash_screen_prepare weak, remove config macro Robert Winkler 2013-06-18 6:24 ` Igor Grinberg 2013-06-17 18:31 ` [U-Boot] [PATCH 3/3] omap: cm_t35: Fix cm_t35 for weak splash_screen_prepare Robert Winkler 2013-06-18 6:26 ` Igor Grinberg 2013-06-18 16:28 ` Robert Winkler 2013-06-19 5:38 ` Igor Grinberg 2013-06-26 23:00 ` [U-Boot] [PATCH 0/3 v2] video: lcd: splash screen prepare changes Robert Winkler 2013-07-01 19:57 ` Anatolij Gustschin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox