video: Drop CONFIG_LCD_INFO

This option is not used anymore since the LCD implementation is being
removed. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 8a7a960..e5fdf38 100644 (file)
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -194,34 +194,6 @@ static void at91sam9261ek_lcd_hw_init(void)
 #endif
 }
 
-#ifdef CONFIG_LCD_INFO
-#include <nand.h>
-#include <version.h>
-
-void lcd_show_board_info(void)
-{
-       ulong dram_size, nand_size;
-       int i;
-       char temp[32];
-
-       lcd_printf ("%s\n", U_BOOT_VERSION);
-       lcd_printf ("(C) 2008 ATMEL Corp\n");
-       lcd_printf ("at91support@atmel.com\n");
-       lcd_printf ("%s CPU at %s MHz\n",
-               ATMEL_CPU_NAME,
-               strmhz(temp, get_cpu_clk_rate()));
-
-       dram_size = 0;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-               dram_size += gd->bd->bi_dram[i].size;
-       nand_size = 0;
-       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-               nand_size += get_nand_dev_by_index(i)->size;
-       lcd_printf ("  %ld MB SDRAM, %ld MB NAND\n",
-               dram_size >> 20,
-               nand_size >> 20 );
-}
-#endif /* CONFIG_LCD_INFO */
 #endif
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT

diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 86b4050..7c15a76 100644 (file)
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -134,51 +134,6 @@ static void at91sam9263ek_lcd_hw_init(void)
        gd->fb_base = ATMEL_BASE_SRAM0;
 }
 
-#ifdef CONFIG_LCD_INFO
-#include <nand.h>
-#include <version.h>
-
-#ifdef CONFIG_MTD_NOR_FLASH
-#include <flash.h>
-#endif
-
-void lcd_show_board_info(void)
-{
-       ulong dram_size, nand_size;
-#ifdef CONFIG_MTD_NOR_FLASH
-       ulong flash_size;
-#endif
-       int i;
-       char temp[32];
-
-       lcd_printf ("%s\n", U_BOOT_VERSION);
-       lcd_printf ("(C) 2008 ATMEL Corp\n");
-       lcd_printf ("at91support@atmel.com\n");
-       lcd_printf ("%s CPU at %s MHz\n",
-               ATMEL_CPU_NAME,
-               strmhz(temp, get_cpu_clk_rate()));
-
-       dram_size = 0;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-               dram_size += gd->bd->bi_dram[i].size;
-       nand_size = 0;
-       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-               nand_size += get_nand_dev_by_index(i)->size;
-#ifdef CONFIG_MTD_NOR_FLASH
-       flash_size = 0;
-       for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++)
-               flash_size += flash_info[i].size;
-#endif
-       lcd_printf ("  %ld MB SDRAM, %ld MB NAND",
-               dram_size >> 20,
-               nand_size >> 20 );
-#ifdef CONFIG_MTD_NOR_FLASH
-       lcd_printf (",\n  %ld MB NOR",
-               flash_size >> 20);
-#endif
-       lcd_puts ("\n");
-}
-#endif /* CONFIG_LCD_INFO */
 #endif
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT

diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 347197a..3ab9fb3 100644 (file)
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -218,34 +218,6 @@ static void at91sam9m10g45ek_lcd_hw_init(void)
        gd->fb_base = 0x73E00000;
 }
 
-#ifdef CONFIG_LCD_INFO
-#include <nand.h>
-#include <version.h>
-
-void lcd_show_board_info(void)
-{
-       ulong dram_size, nand_size;
-       int i;
-       char temp[32];
-
-       lcd_printf ("%s\n", U_BOOT_VERSION);
-       lcd_printf ("(C) 2008 ATMEL Corp\n");
-       lcd_printf ("at91support@atmel.com\n");
-       lcd_printf ("%s CPU at %s MHz\n",
-               ATMEL_CPU_NAME,
-               strmhz(temp, get_cpu_clk_rate()));
-
-       dram_size = 0;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-               dram_size += gd->bd->bi_dram[i].size;
-       nand_size = 0;
-       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-               nand_size += get_nand_dev_by_index(i)->size;
-       lcd_printf ("  %ld MB SDRAM, %ld MB NAND\n",
-               dram_size >> 20,
-               nand_size >> 20 );
-}
-#endif /* CONFIG_LCD_INFO */
 #endif
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT

diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index a337db4..5825ef8 100644 (file)
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -21,11 +21,6 @@
 #include <atmel_hlcdc.h>
 #include <netdev.h>
 
-#ifdef CONFIG_LCD_INFO
-#include <nand.h>
-#include <version.h>
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 /* ------------------------------------------------------------------------- */
@@ -108,31 +103,6 @@ void lcd_disable(void)
        at91_set_pio_output(AT91_PIO_PORTC, 25, 1);     /* power down */
 }
 
-#ifdef CONFIG_LCD_INFO
-void lcd_show_board_info(void)
-{
-       ulong dram_size, nand_size;
-       int i;
-       char temp[32];
-
-       lcd_printf("%s\n", U_BOOT_VERSION);
-       lcd_printf("ATMEL Corp\n");
-       lcd_printf("at91@atmel.com\n");
-       lcd_printf("%s CPU at %s MHz\n",
-               ATMEL_CPU_NAME,
-               strmhz(temp, get_cpu_clk_rate()));
-
-       dram_size = 0;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-               dram_size += gd->bd->bi_dram[i].size;
-       nand_size = 0;
-       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-               nand_size += get_nand_dev_by_index(i)->size;
-       lcd_printf("  %ld MB SDRAM, %ld MB NAND\n",
-               dram_size >> 20,
-               nand_size >> 20);
-}
-#endif /* CONFIG_LCD_INFO */
 #endif /* CONFIG_LCD */
 
 #ifdef CONFIG_USB_ATMEL

diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index af59620..45dfaa5 100644 (file)
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -129,34 +129,6 @@ static void at91sam9rlek_lcd_hw_init(void)
        at91_periph_clk_enable(ATMEL_ID_LCDC);
 }
 
-#ifdef CONFIG_LCD_INFO
-#include <nand.h>
-#include <version.h>
-
-void lcd_show_board_info(void)
-{
-       ulong dram_size, nand_size;
-       int i;
-       char temp[32];
-
-       lcd_printf ("%s\n", U_BOOT_VERSION);
-       lcd_printf ("(C) 2008 ATMEL Corp\n");
-       lcd_printf ("at91support@atmel.com\n");
-       lcd_printf ("%s CPU at %s MHz\n",
-               ATMEL_CPU_NAME,
-               strmhz(temp, get_cpu_clk_rate()));
-
-       dram_size = 0;
-       for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-               dram_size += gd->bd->bi_dram[i].size;
-       nand_size = 0;
-       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-               nand_size += get_nand_dev_by_index(i)->size;
-       lcd_printf ("  %ld MB SDRAM, %ld MB NAND\n",
-               dram_size >> 20,
-               nand_size >> 20 );
-}
-#endif /* CONFIG_LCD_INFO */
 #endif
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT

diff --git a/common/lcd.c b/common/lcd.c
index 53ff8dd..36c97df 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -524,11 +524,6 @@ static void lcd_logo(void)
 {
        lcd_logo_plot(0, 0);
 
-#ifdef CONFIG_LCD_INFO
-       lcd_set_col(LCD_INFO_X / VIDEO_FONT_WIDTH);
-       lcd_set_row(LCD_INFO_Y / VIDEO_FONT_HEIGHT);
-       lcd_show_board_info();
-#endif /* CONFIG_LCD_INFO */
 }
 
 #ifdef CONFIG_SPLASHIMAGE_GUARD

diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index 0e9cb5d..ddb8173 100644 (file)
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -68,6 +68,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_ATMEL_LCD=y
 CONFIG_ATMEL_LCD_BGR555=y
 CONFIG_LCD=y
-CONFIG_LCD_INFO=y
 CONFIG_LCD_LOGO=y
 CONFIG_REGEX=y

diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index 2a16c83..9515c4c 100644 (file)
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -71,6 +71,5 @@ CONFIG_DM_VIDEO=y
 CONFIG_ATMEL_LCD=y
 CONFIG_ATMEL_LCD_BGR555=y
 CONFIG_LCD=y
-CONFIG_LCD_INFO=y
 CONFIG_LCD_LOGO=y
 CONFIG_JFFS2_NAND=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 9083267..7213d9c 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -728,10 +728,6 @@ config LCD
          CONFIG option. See the README for details. Drives which have been
          converted to driver model will instead used CONFIG_DM_VIDEO.
 
-config LCD_INFO
-       bool "Show LCD info on-screen"
-       depends on LCD
-
 config LCD_LOGO
        bool "Show a logo on screen"
        depends on LCD

diff --git a/include/lcd.h b/include/lcd.h
index 751b003..b482003 100644 (file)
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -144,14 +144,6 @@ void lcd_sync(void);
 #define LCD_COLOR16    4
 #define LCD_COLOR32    5
 
-#if defined(CONFIG_LCD_LOGO)
-#define LCD_INFO_X             (BMP_LOGO_WIDTH + 4 * VIDEO_FONT_WIDTH)
-#define LCD_INFO_Y             VIDEO_FONT_HEIGHT
-#else
-#define LCD_INFO_X             VIDEO_FONT_WIDTH
-#define LCD_INFO_Y             VIDEO_FONT_HEIGHT
-#endif
-
 /* Default to 8bpp if bit depth not specified */
 #ifndef LCD_BPP
 #define LCD_BPP                        LCD_COLOR8