s5pc110: universal: Handle lcd option "default: lcd=on"

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

diff --git a/drivers/video/s5p-fb.c b/drivers/video/s5p-fb.c
index 6b32967..44974e9 100644 (file)
--- a/drivers/video/s5p-fb.c
+++ b/drivers/video/s5p-fb.c
@@ -200,16 +200,20 @@ static void lcd_panel_on(void)
 
 void lcd_ctrl_init(void *lcdbase)
 {
+       char *option;
+
        s5pc_lcd_init_mem(lcdbase, &panel_info);
 
-#if defined(CONFIG_S5PC1XXFB_TEST)
-       memset(lcdbase, 0, PANEL_WIDTH*PANEL_HEIGHT*S5P_LCD_BPP/8);
-       lcd_test();
-#endif
-#if defined(CONFIG_S5PC1XXFB_LOGO)
-       memset(lcdbase, 0, PANEL_WIDTH*PANEL_HEIGHT*S5P_LCD_BPP/8);
-       draw_samsung_logo(lcdbase);
-#endif
+       option = getenv("lcd");
+
+       if (strcmp(option, "test") == 0) {
+               memset(lcdbase, 0, PANEL_WIDTH*PANEL_HEIGHT*S5P_LCD_BPP >> 3);
+               lcd_test();
+       } else {
+               memset(lcdbase, 0, PANEL_WIDTH*PANEL_HEIGHT*S5P_LCD_BPP >> 3);
+               draw_samsung_logo(lcdbase);
+       }
+
        s5pc_gpio_setup();
 
        s5pc_lcd_init(&panel_info);

diff --git a/include/configs/s5pc100_universal.h b/include/configs/s5pc100_universal.h
index 4af41bc..ab15b4a 100644 (file)
--- a/include/configs/s5pc100_universal.h
+++ b/include/configs/s5pc100_universal.h
@@ -288,8 +288,6 @@
 #define CONFIG_LCD             1
 #define CONFIG_S5PC1XXFB       1
 #define BOARD_LATE_INIT
-//#define CONFIG_S5PC1XXFB_TEST                /* for LCD Panel test */
-#define CONFIG_S5PC1XXFB_LOGO          /* default: samsung logo */
 #endif
 
 #endif /* __CONFIG_H */