X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=cpu%2Fmpc8xx%2Flcd.c;h=3c64a9ba4e0e01fbda6b40621a5b4015ff22404f;hp=cc58676868bf80215aa94ab9feca0fdb63478cc4;hb=88804d19e2bf36c9eaefadbd7199c093c900953b;hpb=3c71f3e8aa4d74bc5b43dc55f9be893afbc13497 diff --git a/cpu/mpc8xx/lcd.c b/cpu/mpc8xx/lcd.c index cc58676868..3c64a9ba4e 100644 --- a/cpu/mpc8xx/lcd.c +++ b/cpu/mpc8xx/lcd.c @@ -46,12 +46,13 @@ /************************************************************************/ /* ** CONFIG STUFF -- should be moved to board config file */ /************************************************************************/ -#define CONFIG_LCD_LOGO -#define LCD_INFO /* Display Logo, (C) and system info */ +#ifndef CONFIG_LCD_INFO +#define CONFIG_LCD_INFO /* Display Logo, (C) and system info */ +#endif #if defined(CONFIG_V37) || defined(CONFIG_EDT32F10) #undef CONFIG_LCD_LOGO -#undef LCD_INFO +#undef CONFIG_LCD_INFO #endif /*----------------------------------------------------------------------*/ @@ -155,7 +156,7 @@ vidinfo_t panel_info = { 3, 0, 0, 1, 1, 15, 4, 0, 3 /* wbl, vpw, lcdac, wbf */ }; -#define LCD_INFO_BELOW_LOGO +#define CONFIG_LCD_INFO_BELOW_LOGO #endif /* CONFIG_SHARP_LQ057Q3DC02 */ /*----------------------------------------------------------------------*/ @@ -179,7 +180,7 @@ vidinfo_t panel_info = { 3, 0, 0, 1, 1, 248, 4, 0, 35 /* wbl, vpw, lcdac, wbf */ }; -#define LCD_INFO_BELOW_LOGO +#define CONFIG_LCD_INFO_BELOW_LOGO #endif /* CONFIG_SHARP_LQ065T9DR51U */ #ifdef CONFIG_SHARP_LQ084V1DG21