projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next'
[platform/kernel/u-boot.git]
/
include
/
lcd.h
diff --git
a/include/lcd.h
b/include/lcd.h
index
44ac8ef
..
512221e
100644
(file)
--- a/
include/lcd.h
+++ b/
include/lcd.h
@@
-197,6
+197,8
@@
void lcd_putc (const char c);
void lcd_puts (const char *s);
void lcd_printf (const char *fmt, ...);
void lcd_puts (const char *s);
void lcd_printf (const char *fmt, ...);
+/* Allow boards to customize the information displayed */
+void lcd_show_board_info(void);
/************************************************************************/
/* ** BITMAP DISPLAY SUPPORT */
/************************************************************************/
/* ** BITMAP DISPLAY SUPPORT */
@@
-211,8
+213,8
@@
void lcd_printf (const char *fmt, ...);
* the LCD controller and memory allocation. Someone has to know what
* is connected, as we can't autodetect anything.
*/
* the LCD controller and memory allocation. Someone has to know what
* is connected, as we can't autodetect anything.
*/
-#define C
FG_HIGH
0 /* Pins are active high */
-#define C
FG_LOW
1 /* Pins are active low */
+#define C
ONFIG_SYS_HIGH
0 /* Pins are active high */
+#define C
ONFIG_SYS_LOW
1 /* Pins are active low */
#define LCD_MONOCHROME 0
#define LCD_COLOR2 1
#define LCD_MONOCHROME 0
#define LCD_COLOR2 1