summaryrefslogtreecommitdiff
path: root/board/mcc200/lcd.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-11-16 20:44:03 +0100
committerWolfgang Denk <wd@denx.de>2011-11-16 20:44:03 +0100
commit9dfa8da709a1589d177d99c597d9b18d8c9a145d (patch)
treee5f42ab6c6bcfffd17eb60306ffad2c0567dac6f /board/mcc200/lcd.c
parent0c2dd9a05bdcf3b2b4880509ec690116873fe158 (diff)
parenta2a5729fc1247bb45d794e9d731c0b03bf58096f (diff)
downloadu-boot-imx-9dfa8da709a1589d177d99c597d9b18d8c9a145d.zip
u-boot-imx-9dfa8da709a1589d177d99c597d9b18d8c9a145d.tar.gz
u-boot-imx-9dfa8da709a1589d177d99c597d9b18d8c9a145d.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
* 'master' of git://git.denx.de/u-boot-video: api: export LCD device to external apps font: split font data from video_font.h tools: logo: split bmp arrays from bmp_logo.h lcd: add clear and draw bitmap declaration VIDEO: mx3fb: GCC4.6 fix build warnings Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug
Diffstat (limited to 'board/mcc200/lcd.c')
-rw-r--r--board/mcc200/lcd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/board/mcc200/lcd.c b/board/mcc200/lcd.c
index 726366d..d8f754c 100644
--- a/board/mcc200/lcd.c
+++ b/board/mcc200/lcd.c
@@ -55,6 +55,9 @@
#define PSOC_RETRIES 10 /* each of PSOC_WAIT_TIME */
#define PSOC_WAIT_TIME 10 /* usec */
+#include <video_font.h>
+#define FONT_WIDTH VIDEO_FONT_WIDTH
+
DECLARE_GLOBAL_DATA_PTR;
/*
@@ -185,7 +188,6 @@ void lcd_enable (void)
}
#ifdef CONFIG_PROGRESSBAR
-#define FONT_WIDTH 8 /* the same as VIDEO_FONT_WIDTH in video_font.h */
void show_progress (int size, int tot)
{
int cnt;