summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-10-28 08:37:19 +0100
committerWolfgang Denk <wd@denx.de>2008-10-28 08:37:19 +0100
commitd35c451d6cff3e77e40fbdfc7a2933cdcb86ae4b (patch)
treeb9cabe836db20373a8e645b30be6c0aa6eb7896a /include
parenta369f4a492fa2805d87775d27380f0eeaca35aa6 (diff)
parent6b59e03e0237a40a2305ea385defdfd92000978b (diff)
downloadtalos-obmc-uboot-d35c451d6cff3e77e40fbdfc7a2933cdcb86ae4b.tar.gz
talos-obmc-uboot-d35c451d6cff3e77e40fbdfc7a2933cdcb86ae4b.zip
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-at91/gpio.h1
-rw-r--r--include/lcd.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-arm/arch-at91/gpio.h b/include/asm-arm/arch-at91/gpio.h
index c4d7b971be..e2d375b34c 100644
--- a/include/asm-arm/arch-at91/gpio.h
+++ b/include/asm-arm/arch-at91/gpio.h
@@ -16,6 +16,7 @@
#include <asm/io.h>
#include <asm/errno.h>
#include <asm/arch/at91_pio.h>
+#include <asm/arch/hardware.h>
#define PIN_BASE 32
diff --git a/include/lcd.h b/include/lcd.h
index 15affb85cb..512221e9c4 100644
--- 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, ...);
+/* Allow boards to customize the information displayed */
+void lcd_show_board_info(void);
/************************************************************************/
/* ** BITMAP DISPLAY SUPPORT */
OpenPOWER on IntegriCloud