diff options
| author | Justin Waters <justin.waters@timesys.com> | 2009-01-27 16:39:30 -0500 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2009-01-27 16:53:21 -0500 |
| commit | 9187df48c94af2dabf4e533a62c0e0ed7bf25665 (patch) | |
| tree | c4e2e3836528495b6cd77cd1dfe81a0db46cf5d1 | |
| parent | 380bc0f188f8d41889fde822bcf7ed1afc96e348 (diff) | |
Add additional checks on CONFIG_LCD_INFO_BELOW_LOGO2009.01-at91-200901272139
CONFIG_LCD_INFO_BELOW_LOGO is really only meaningful if
CONFIG_LCD_LOGO is set. We should always check to see if
CONFIG_LCD_LOGO is set whenever we do anything based on it.
Otherwise, we will run into compilation problems.
Signed-off-by: Justin Waters <justin.waters@timesys.com>
| -rw-r--r-- | common/lcd.c | 2 | ||||
| -rw-r--r-- | include/lcd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/lcd.c b/common/lcd.c index ae79051d1eb..64b8722701f 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -444,7 +444,7 @@ static int lcd_init (void *lcdbase) /* Initialize the console */ console_col = 0; -#ifdef CONFIG_LCD_INFO_BELOW_LOGO +#if defined(CONFIG_LCD_LOGO) && defined(CONFIG_LCD_INFO_BELOW_LOGO) console_row = 7 + BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT; #else console_row = 1; /* leave 1 blank line below logo */ diff --git a/include/lcd.h b/include/lcd.h index 512221e9c46..41339d611e0 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -223,7 +223,7 @@ void lcd_show_board_info(void); #define LCD_COLOR16 4 /*----------------------------------------------------------------------*/ -#if defined(CONFIG_LCD_INFO_BELOW_LOGO) +#if defined(CONFIG_LCD_LOGO) && 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) |