[U-Boot] Pull request: u-boot-video/master
Hello Tom,
The following changes since commit a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721:
Merge branch 'master' of git://git.denx.de/u-boot-avr32 (2012-09-04 09:17:27 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-video.git master
Nikita Kiryanov (5): common lcd: simplify lcd_logo common lcd: simplify lcd_display common lcd: simplify core functions common lcd: simplify lcd_display_bitmap common/lcd: add protection from null bmp pointer
Timur Tabi (1): video/powerpc: don't touch DIU registers that we don't need
board/mcc200/lcd.c | 20 ++++++ common/lcd.c | 147 +++++++++++++++++++++++--------------------- drivers/video/fsl_diu_fb.c | 21 +------ 3 files changed, 99 insertions(+), 89 deletions(-)
Please pull. Thanks!
Anatolij
On Sat, Sep 22, 2012 at 12:10:07AM +0200, Anatolij Gustschin wrote:
Hello Tom,
The following changes since commit a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721:
Merge branch 'master' of git://git.denx.de/u-boot-avr32 (2012-09-04 09:17:27 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-video.git master
Nikita Kiryanov (5): common lcd: simplify lcd_logo common lcd: simplify lcd_display common lcd: simplify core functions common lcd: simplify lcd_display_bitmap common/lcd: add protection from null bmp pointer
Timur Tabi (1): video/powerpc: don't touch DIU registers that we don't need
board/mcc200/lcd.c | 20 ++++++ common/lcd.c | 147 +++++++++++++++++++++++--------------------- drivers/video/fsl_diu_fb.c | 21 +------ 3 files changed, 99 insertions(+), 89 deletions(-)
Please pull. Thanks!
One of these changes introduced: Testing trats on -00680-g2dfe86b Fri Sep 21 16:20:07 MST 2012 Configuring for trats board... lcd.c:513:29: error: 'struct vidinfo' has no member named 'cmap' make[1]: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/lcd.o] Error 1 make: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/libcommon.o] Error 2 arm-linux-gnueabi-size: 'trats/u-boot': No such file lcd.c: In function 'configuration_get_cmap': lcd.c:513:29: error: 'struct vidinfo' has no member named 'cmap' lcd.c: In function 'lcd_display_bitmap': lcd.c:787:6: warning: implicit declaration of function 'FB_PUT_BYTE' [-Wimplicit-function-declaration] lcd.c: In function 'configuration_get_cmap': lcd.c:515:1: warning: control reaches end of non-void function [-Wreturn-type] make[1]: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/lcd.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/libcommon.o] Error 2 make: *** Waiting for unfinished jobs....
--------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with errors: 1 ( trats ) ----------------------------------------------------------
Rejected, please fix and re-submit. Thanks!
On Fri, 21 Sep 2012 16:21:22 -0700 Tom Rini trini@ti.com wrote: ...
lcd.c: In function 'configuration_get_cmap': lcd.c:513:29: error: 'struct vidinfo' has no member named 'cmap' lcd.c: In function 'lcd_display_bitmap': lcd.c:787:6: warning: implicit declaration of function 'FB_PUT_BYTE' [-Wimplicit-function-declaration] lcd.c: In function 'configuration_get_cmap': lcd.c:515:1: warning: control reaches end of non-void function [-Wreturn-type] make[1]: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/lcd.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/libcommon.o] Error 2 make: *** Waiting for unfinished jobs....
--------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with errors: 1 ( trats )
Rejected, please fix and re-submit. Thanks!
Sorry, I trusted the statement of the submitter that he did run MAKEALL for arm and powerpc for these lcd patches, and thus didn't verify by my own MAKEALL tests. I'll fix and resubmit.
Thanks, Anatolij
On 09/25/12 22:12, Anatolij Gustschin wrote:
On Fri, 21 Sep 2012 16:21:22 -0700 Tom Rini trini@ti.com wrote: ...
lcd.c: In function 'configuration_get_cmap': lcd.c:513:29: error: 'struct vidinfo' has no member named 'cmap' lcd.c: In function 'lcd_display_bitmap': lcd.c:787:6: warning: implicit declaration of function 'FB_PUT_BYTE' [-Wimplicit-function-declaration] lcd.c: In function 'configuration_get_cmap': lcd.c:515:1: warning: control reaches end of non-void function [-Wreturn-type] make[1]: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/lcd.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/libcommon.o] Error 2 make: *** Waiting for unfinished jobs....
--------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with errors: 1 ( trats )
Rejected, please fix and re-submit. Thanks!
Sorry, I trusted the statement of the submitter that he did run MAKEALL for arm and powerpc for these lcd patches, and thus didn't verify by my own MAKEALL tests. I'll fix and resubmit.
You can still trust the submitter, Nikita ran the MAKEALL for arm and ppc. The problem is that it was back in the beginning of August... It is just the time frame between the submission and the pickup that changed things and probably made a difference.
Nikita, has not been around for a while and therefore had no chance to look into your fix and ack it. Nevertheless, thanks for your patch, that fixed the failing boards.
On 09/28/12 09:40, Igor Grinberg wrote:
On 09/25/12 22:12, Anatolij Gustschin wrote:
On Fri, 21 Sep 2012 16:21:22 -0700 Tom Rini trini@ti.com wrote: ...
lcd.c: In function 'configuration_get_cmap': lcd.c:513:29: error: 'struct vidinfo' has no member named 'cmap' lcd.c: In function 'lcd_display_bitmap': lcd.c:787:6: warning: implicit declaration of function 'FB_PUT_BYTE' [-Wimplicit-function-declaration] lcd.c: In function 'configuration_get_cmap': lcd.c:515:1: warning: control reaches end of non-void function [-Wreturn-type] make[1]: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/lcd.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [/home/trini/work/ssd/u-boot/u-boot/trats/common/libcommon.o] Error 2 make: *** Waiting for unfinished jobs....
--------------------- SUMMARY ---------------------------- Boards compiled: 1 Boards with errors: 1 ( trats )
Rejected, please fix and re-submit. Thanks!
Sorry, I trusted the statement of the submitter that he did run MAKEALL for arm and powerpc for these lcd patches, and thus didn't verify by my own MAKEALL tests. I'll fix and resubmit.
You can still trust the submitter, Nikita ran the MAKEALL for arm and ppc. The problem is that it was back in the beginning of August... It is just the time frame between the submission and the pickup that changed things and probably made a difference.
Nikita, has not been around for a while and therefore had no chance to look into your fix and ack it.
Oh, he actually did ack it - I'v missed this, sorry.
Nevertheless, thanks for your patch, that fixed the failing boards.
On Fri, 28 Sep 2012 09:40:49 +0200 Igor Grinberg grinberg@compulab.co.il wrote: ...
You can still trust the submitter, Nikita ran the MAKEALL for arm and ppc. The problem is that it was back in the beginning of August... It is just the time frame between the submission and the pickup that changed things and probably made a difference.
Yes, I think so. The fault is on my side, sorry.
Thanks, Anatolij
On 09/28/12 10:21, Anatolij Gustschin wrote:
On Fri, 28 Sep 2012 09:40:49 +0200 Igor Grinberg grinberg@compulab.co.il wrote: ...
You can still trust the submitter, Nikita ran the MAKEALL for arm and ppc. The problem is that it was back in the beginning of August... It is just the time frame between the submission and the pickup that changed things and probably made a difference.
Yes, I think so. The fault is on my side, sorry.
Anatolij, please, don't get it this way. I'm not trying to accuse anyone, we all have lots of stuff going on in parallel and we all make mistakes. These kind of problems are pretty common in Linux kernel where multiple subsystems touch same files and things get merged in _parallel_ resulting in newly merged files that are already broken etc.
I just want to thank Tom for spotting the breakage and to thank you for the fast response and fix for that breakage. After all, we are working on the same stuff and I consider our work a common effort to make U-Boot a better boot loader.
participants (3)
-
Anatolij Gustschin -
Igor Grinberg -
Tom Rini