summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-09-25 16:31:16 +0200
committerWolfgang Denk <wd@pollux.(none)>2005-09-25 16:31:16 +0200
commitc177bb5f6c0d496c5e2a429c72f89f325b46198c (patch)
tree2abadcdb7b064bec789e3853e629f6f6637f376f
parent1972dc0a9ef329c8b1aa27621a4033b9bb5f34a7 (diff)
downloadu-boot-c177bb5f6c0d496c5e2a429c72f89f325b46198c.tar.gz
u-boot-c177bb5f6c0d496c5e2a429c72f89f325b46198c.tar.xz
u-boot-c177bb5f6c0d496c5e2a429c72f89f325b46198c.zip
Fix VOH405 Support
Patch by Matthias Fuchs, 25 Sep 2005
-rw-r--r--CHANGELOG3
-rw-r--r--board/esd/common/lcd.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 97b3efe979..45f759e78f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4:
======================================================================
+* Fix VOH405 Support
+ Patch by Matthias Fuchs, 25 Sep 2005
+
* Added support for PCI bridge on MPC8272ADS
Patch by Vitaly Bordug, Feb 09 2005
diff --git a/board/esd/common/lcd.c b/board/esd/common/lcd.c
index 22b49ce256..05c76ff098 100644
--- a/board/esd/common/lcd.c
+++ b/board/esd/common/lcd.c
@@ -99,7 +99,7 @@ void lcd_bmp(uchar *logo_bmp)
/*
* Decompress bmp image
*/
- len = CFG_VIDEO_LOGO_MAX_SIZE;
+ len = CFG_LCD_LOGO_MAX_SIZE;
dst = malloc(CFG_LCD_LOGO_MAX_SIZE);
do_free = 1;
if (gunzip(dst, CFG_LCD_LOGO_MAX_SIZE, (uchar *)logo_bmp, &len) != 0) {
@@ -291,7 +291,7 @@ void lcd_init(uchar *lcd_reg, uchar *lcd_mem, S1D_REGS *regs, int reg_count,
lcd_bmp(logo_bmp);
}
-
+#ifdef CONFIG_VIDEO_SM501
int do_esdbmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
ulong addr;
@@ -324,3 +324,4 @@ U_BOOT_CMD(
"esdbmp - display BMP image\n",
"<imageAddr> - display image\n"
);
+#endif