random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 20:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

video: Drop CONFIG_LCD_INFO

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

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-10-16 15:11:32 -06:00 committed by Anatolij Gustschin
parent 816605652d
commit ba97899349
10 changed files with 0 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
board/atmel/at91sam9261ek/at91sam9261ek.c
View File

@ -194,34 +194,6 @@ static void at91sam9261ek_lcd_hw_init(void)
#endif #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 #endif
#ifdef CONFIG_DEBUG_UART_BOARD_INIT #ifdef CONFIG_DEBUG_UART_BOARD_INIT

45
board/atmel/at91sam9263ek/at91sam9263ek.c
View File

@ -134,51 +134,6 @@ static void at91sam9263ek_lcd_hw_init(void)
gd->fb_base = ATMEL_BASE_SRAM0; 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 #endif
#ifdef CONFIG_DEBUG_UART_BOARD_INIT #ifdef CONFIG_DEBUG_UART_BOARD_INIT

28
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
View File

@ -218,34 +218,6 @@ static void at91sam9m10g45ek_lcd_hw_init(void)
gd->fb_base = 0x73E00000; 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 #endif
#ifdef CONFIG_DEBUG_UART_BOARD_INIT #ifdef CONFIG_DEBUG_UART_BOARD_INIT

30
board/atmel/at91sam9n12ek/at91sam9n12ek.c
View File

@ -21,11 +21,6 @@
#include <atmel_hlcdc.h> #include <atmel_hlcdc.h>
#include <netdev.h> #include <netdev.h>
#ifdef CONFIG_LCD_INFO
#include <nand.h>
#include <version.h>
#endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -108,31 +103,6 @@ void lcd_disable(void)
at91_set_pio_output(AT91_PIO_PORTC, 25, 1); /* power down */ 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 */ #endif /* CONFIG_LCD */
#ifdef CONFIG_USB_ATMEL #ifdef CONFIG_USB_ATMEL

28
board/atmel/at91sam9rlek/at91sam9rlek.c
View File

@ -129,34 +129,6 @@ static void at91sam9rlek_lcd_hw_init(void)
at91_periph_clk_enable(ATMEL_ID_LCDC); 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 #endif
#ifdef CONFIG_DEBUG_UART_BOARD_INIT #ifdef CONFIG_DEBUG_UART_BOARD_INIT

5
common/lcd.c
View File

@ -524,11 +524,6 @@ static void lcd_logo(void)
{ {
lcd_logo_plot(0, 0); 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 #ifdef CONFIG_SPLASHIMAGE_GUARD

1
configs/pm9261_defconfig
View File

@ -68,6 +68,5 @@ CONFIG_DM_VIDEO=y
CONFIG_ATMEL_LCD=y CONFIG_ATMEL_LCD=y
CONFIG_ATMEL_LCD_BGR555=y CONFIG_ATMEL_LCD_BGR555=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_LCD_INFO=y
CONFIG_LCD_LOGO=y CONFIG_LCD_LOGO=y
CONFIG_REGEX=y CONFIG_REGEX=y

1
configs/pm9263_defconfig
View File

@ -71,6 +71,5 @@ CONFIG_DM_VIDEO=y
CONFIG_ATMEL_LCD=y CONFIG_ATMEL_LCD=y
CONFIG_ATMEL_LCD_BGR555=y CONFIG_ATMEL_LCD_BGR555=y
CONFIG_LCD=y CONFIG_LCD=y
CONFIG_LCD_INFO=y
CONFIG_LCD_LOGO=y CONFIG_LCD_LOGO=y
CONFIG_JFFS2_NAND=y CONFIG_JFFS2_NAND=y

4
drivers/video/Kconfig
View File

@ -728,10 +728,6 @@ config LCD
CONFIG option. See the README for details. Drives which have been CONFIG option. See the README for details. Drives which have been
converted to driver model will instead used CONFIG_DM_VIDEO. 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 config LCD_LOGO
bool "Show a logo on screen" bool "Show a logo on screen"
depends on LCD depends on LCD

8
include/lcd.h
View File

@ -144,14 +144,6 @@ void lcd_sync(void);
#define LCD_COLOR16 4 #define LCD_COLOR16 4
#define LCD_COLOR32 5 #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 */ /* Default to 8bpp if bit depth not specified */
#ifndef LCD_BPP #ifndef LCD_BPP
#define LCD_BPP LCD_COLOR8 #define LCD_BPP LCD_COLOR8