[U-Boot] [PATCH] lcd: Let the board code show board-specific info cleanup
Allow tqm8xx.c to cleanly compile when CONFIG_LCD_INFO is defined and remove unneeded version.h from lcd.c
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- I noticed this when adding timestamp.h to tqm8xx.c. The "Update U-Boot's build timestamp on every compile" patch should be applied first.
It looks like neither tqm8xx.c or lwmon.c would compile if CONFIG_LCD_INFO_BELOW_LOGO were defined since 6b59e03e0237a40a2305ea385defdfd92000978b FWIW.
board/tqc/tqm8xx/tqm8xx.c | 3 +++ common/lcd.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c index 8424804..1a71591 100644 --- a/board/tqc/tqm8xx/tqm8xx.c +++ b/board/tqc/tqm8xx/tqm8xx.c @@ -570,10 +570,13 @@ void ide_led (uchar led, uchar status)
#ifdef CONFIG_LCD_INFO #include <lcd.h> +#include <version.h> #include <timestamp.h>
void lcd_show_board_info(void) { + char temp[32]; + lcd_printf ("%s (%s - %s)\n", U_BOOT_VERSION, U_BOOT_DATE, U_BOOT_TIME); lcd_printf ("(C) 2008 DENX Software Engineering GmbH\n"); lcd_printf (" Wolfgang DENK, wd@denx.de\n"); diff --git a/common/lcd.c b/common/lcd.c index 31bb190..ae79051 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -32,7 +32,6 @@ #include <config.h> #include <common.h> #include <command.h> -#include <version.h> #include <stdarg.h> #include <linux/types.h> #include <devices.h>
Dear Peter Tyser,
In message 1225469558-25588-1-git-send-email-ptyser@xes-inc.com you wrote:
Allow tqm8xx.c to cleanly compile when CONFIG_LCD_INFO is defined and remove unneeded version.h from lcd.c
Signed-off-by: Peter Tyser ptyser@xes-inc.com
I noticed this when adding timestamp.h to tqm8xx.c. The "Update U-Boot's build timestamp on every compile" patch should be applied first.
Could you please rebase and resubmit that patch? It doesn't apply:
Applying lcd: Let the board code show board-specific info cleanup error: patch failed: board/tqc/tqm8xx/tqm8xx.c:570 error: board/tqc/tqm8xx/tqm8xx.c: patch does not apply fatal: sha1 information is lacking or useless (board/tqc/tqm8xx/tqm8xx.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001.
Thanks.
Best regards,
Wolfgang Denk
Hi Wolfgang,
In message 1225469558-25588-1-git-send-email-ptyser@xes-inc.com you wrote:
Allow tqm8xx.c to cleanly compile when CONFIG_LCD_INFO is defined and remove unneeded version.h from lcd.c
Signed-off-by: Peter Tyser ptyser@xes-inc.com
I noticed this when adding timestamp.h to tqm8xx.c. The "Update U-Boot's build timestamp on every compile" patch should be applied first.
Could you please rebase and resubmit that patch? It doesn't apply:
This needs to be applied on top of the "Update U-Boot's build timestamp on every compile" patch.
Best, Peter
Dear Peter Tyser,
In message 1225469558-25588-1-git-send-email-ptyser@xes-inc.com you wrote:
Allow tqm8xx.c to cleanly compile when CONFIG_LCD_INFO is defined and remove unneeded version.h from lcd.c
Signed-off-by: Peter Tyser ptyser@xes-inc.com
I noticed this when adding timestamp.h to tqm8xx.c. The "Update U-Boot's build timestamp on every compile" patch should be applied first.
It looks like neither tqm8xx.c or lwmon.c would compile if CONFIG_LCD_INFO_BELOW_LOGO were defined since 6b59e03e0237a40a2305ea385defdfd92000978b FWIW.
board/tqc/tqm8xx/tqm8xx.c | 3 +++ common/lcd.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-)
Applied remaining part of patch. Thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Peter Tyser -
Wolfgang Denk