From 82e0646af782b854965b2cb6d49d462dcf9c7694 Mon Sep 17 00:00:00 2001 From: Wenyou Yang Date: Wed, 13 Sep 2017 14:58:47 +0800 Subject: [PATCH] atmel: common: Add function to display via DM_VIDEO's API Add a function to display the company's logo and board information via the API from DM_VIDEO. This function can be shared by other atmel boards, so locate it in board/atmel/common folder. Signed-off-by: Wenyou Yang Reviewed-by: Simon Glass --- arch/arm/mach-at91/include/mach/at91_common.h | 1 + board/atmel/common/Makefile | 1 + board/atmel/common/video_display.c | 72 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 board/atmel/common/video_display.c diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h index a95fe41610..5416eb455d 100644 --- a/arch/arm/mach-at91/include/mach/at91_common.h +++ b/arch/arm/mach-at91/include/mach/at91_common.h @@ -37,5 +37,6 @@ void redirect_int_from_saic_to_aic(void); void configure_2nd_sram_as_l2_cache(void); int at91_set_ethaddr(int offset); +int at91_video_show_board_info(void); #endif /* AT91_COMMON_H */ diff --git a/board/atmel/common/Makefile b/board/atmel/common/Makefile index 6d9c6850b5..8a6850bc19 100644 --- a/board/atmel/common/Makefile +++ b/board/atmel/common/Makefile @@ -8,4 +8,5 @@ obj-y += board.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_I2C_EEPROM) += mac_eeprom.o +obj-$(CONFIG_DM_VIDEO) += video_display.o endif diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c new file mode 100644 index 0000000000..39ad619819 --- /dev/null +++ b/board/atmel/common/video_display.c @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2017 Microchip + * Wenyou Yang + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +int at91_video_show_board_info(void) +{ + ulong dram_size, nand_size; + int i; + u32 len = 0; + char buf[255]; + char *corp = "2017 Microchip Technology Inc.\n"; + char temp[32]; + struct udevice *dev, *con; + const char *s; + vidinfo_t logo_info; + int ret; + + len += sprintf(&buf[len], "%s\n", U_BOOT_VERSION); + memcpy(&buf[len], corp, strlen(corp)); + len += strlen(corp); + len += sprintf(&buf[len], "%s CPU at %s MHz\n", get_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; +#ifdef CONFIG_NAND_ATMEL + for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) + nand_size += nand_info[i]->size; +#endif + + len += sprintf(&buf[len], "%ld MB SDRAM, %ld MB NAND\n", + dram_size >> 20, nand_size >> 20); + + ret = uclass_get_device(UCLASS_VIDEO, 0, &dev); + if (ret) + return ret; + + microchip_logo_info(&logo_info); + ret = video_bmp_display(dev, logo_info.logo_addr, + logo_info.logo_x_offset, + logo_info.logo_y_offset, false); + if (ret) + return ret; + + ret = uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con); + if (ret) + return ret; + + vidconsole_position_cursor(con, 0, logo_info.logo_height); + for (s = buf, i = 0; i < len; s++, i++) + vidconsole_put_char(con, *s); + + return 0; +} -- 2.39.5