Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

* Patch by Detlev Zundel, 30 Jun 2005:

Browse Source 
Fix LCD logo for lwmon board which got lost in the merge of 8xx and PXA LCD code
This commit is contained in:
wdenk
2005-07-04 00:03:16 +00:00
parent 3c71f3e8aa
commit 88804d19e2
6 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/configs/lwmon.h
View File

@@ -53,6 +53,8 @@
#define CONFIG_LCD 1 /* use LCD controller ... */
#define CONFIG_HLD1045 1 /* ... with a HLD1045 display */
#define CONFIG_LCD_LOGO 1 /* print our logo on the LCD */
#define CONFIG_LCD_INFO 1 /* ... and some board info */
#define CONFIG_SPLASH_SCREEN /* ... with splashscreen support*/
#define CONFIG_SERIAL_MULTI 1

15
include/lcd.h
View File

@@ -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