summaryrefslogtreecommitdiff
path: root/include/lcd.h
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-07-04 00:03:16 +0000
committerwdenk <wdenk>2005-07-04 00:03:16 +0000
commit88804d19e2bf36c9eaefadbd7199c093c900953b (patch)
treeab6beea61b136eb98b0e9e87c7903cc05c52860a /include/lcd.h
parent3c71f3e8aa4d74bc5b43dc55f9be893afbc13497 (diff)
downloadu-boot-imx-88804d19e2bf36c9eaefadbd7199c093c900953b.zip
u-boot-imx-88804d19e2bf36c9eaefadbd7199c093c900953b.tar.gz
u-boot-imx-88804d19e2bf36c9eaefadbd7199c093c900953b.tar.bz2
* Patch by Detlev Zundel, 30 Jun 2005:
Fix LCD logo for lwmon board which got lost in the merge of 8xx and PXA LCD code
Diffstat (limited to 'include/lcd.h')
-rw-r--r--include/lcd.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/include/lcd.h b/include/lcd.h
index 06feab3..7e23736 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -171,13 +171,6 @@ void lcd_printf (const char *fmt, ...);
# include <asm/byteorder.h>
#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */
-/************************************************************************/
-/* ** LOGO DATA */
-/************************************************************************/
-#ifdef CONFIG_LCD_LOGO
-# include <bmp_logo.h> /* Get logo data, width and height */
-#endif
-
/*
* Information about displays we are using. This is for configuring
* the LCD controller and memory allocation. Someone has to know what
@@ -193,7 +186,7 @@ void lcd_printf (const char *fmt, ...);
#define LCD_COLOR16 4
/*----------------------------------------------------------------------*/
-#if defined(LCD_INFO_BELOW_LOGO)
+#if defined(CONFIG_LCD_INFO_BELOW_LOGO)
# define LCD_INFO_X 0
# define LCD_INFO_Y (BMP_LOGO_HEIGHT + VIDEO_FONT_HEIGHT)
#elif defined(CONFIG_LCD_LOGO)
@@ -252,10 +245,6 @@ void lcd_printf (const char *fmt, ...);
#endif /* color definitions */
-#if defined(CONFIG_LCD_LOGO) && (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET)
-# error Default Color Map overlaps with Logo Color Map
-#endif
-
/************************************************************************/
#ifndef PAGE_SIZE
# define PAGE_SIZE 4096
@@ -264,7 +253,7 @@ void lcd_printf (const char *fmt, ...);
/************************************************************************/
/* ** CONSOLE DEFINITIONS & FUNCTIONS */
/************************************************************************/
-#if defined(CONFIG_LCD_LOGO) && !defined(LCD_INFO_BELOW_LOGO)
+#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
# define CONSOLE_ROWS ((panel_info.vl_row-BMP_LOGO_HEIGHT) \
/ VIDEO_FONT_HEIGHT)
#else