projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2019-10-28-azure-ci-support'
[oweals/u-boot.git]
/
common
/
lcd.c
diff --git
a/common/lcd.c
b/common/lcd.c
index 783626e3d54caf4fbdd4940892023a9171ded5df..b34754fe518ca07208ed7bd8d3d107303dc8d934 100644
(file)
--- a/
common/lcd.c
+++ b/
common/lcd.c
@@
-1,10
+1,9
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Common LCD routines
*
* (C) Copyright 2001-2002
* Wolfgang Denk, DENX Software Engineering -- wd@denx.de
/*
* Common LCD routines
*
* (C) Copyright 2001-2002
* Wolfgang Denk, DENX Software Engineering -- wd@denx.de
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/* #define DEBUG */
*/
/* #define DEBUG */
@@
-62,7
+61,7
@@
void lcd_sync(void)
* architectures do not actually implement it. Is there a way to find
* out whether it exists? For now, ARM is safe.
*/
* architectures do not actually implement it. Is there a way to find
* out whether it exists? For now, ARM is safe.
*/
-#if defined(CONFIG_ARM) && !
defined(CONFIG_
SYS_DCACHE_OFF)
+#if defined(CONFIG_ARM) && !
CONFIG_IS_ENABLED(
SYS_DCACHE_OFF)
int line_length;
if (lcd_flush_dcache)
int line_length;
if (lcd_flush_dcache)
@@
-172,8
+171,7
@@
int drv_lcd_init(void)
void lcd_clear(void)
{
int bg_color;
void lcd_clear(void)
{
int bg_color;
- char *s;
- ulong addr;
+ __maybe_unused ulong addr;
static int do_splash = 1;
#if LCD_BPP == LCD_COLOR8
/* Setting the palette */
static int do_splash = 1;
#if LCD_BPP == LCD_COLOR8
/* Setting the palette */
@@
-223,14
+221,10
@@
void lcd_clear(void)
/* Paint the logo and retrieve LCD base address */
debug("[LCD] Drawing the logo...\n");
if (do_splash) {
/* Paint the logo and retrieve LCD base address */
debug("[LCD] Drawing the logo...\n");
if (do_splash) {
- s = getenv("splashimage");
- if (s) {
+ if (splash_display() == 0) {
do_splash = 0;
do_splash = 0;
- addr = simple_strtoul(s, NULL, 16);
- if (lcd_splash(addr) == 0) {
- lcd_sync();
- return;
- }
+ lcd_sync();
+ return;
}
}
}
}
@@
-243,14
+237,6
@@
void lcd_clear(void)
lcd_sync();
}
lcd_sync();
}
-static int do_lcd_clear(cmd_tbl_t *cmdtp, int flag, int argc,
- char *const argv[])
-{
- lcd_clear();
- return 0;
-}
-U_BOOT_CMD(cls, 1, 1, do_lcd_clear, "clear screen", "");
-
static int lcd_init(void *lcdbase)
{
debug("[LCD] Initializing LCD frambuffer at %p\n", lcdbase);
static int lcd_init(void *lcdbase)
{
debug("[LCD] Initializing LCD frambuffer at %p\n", lcdbase);
@@
-390,7
+376,6
@@
static inline void lcd_logo_plot(int x, int y) {}
#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
-#define BMP_ALIGN_CENTER 0x7FFF
static void splash_align_axis(int *axis, unsigned long panel_size,
unsigned long picture_size)
static void splash_align_axis(int *axis, unsigned long panel_size,
unsigned long picture_size)
@@
-562,11
+547,7
@@
__weak void lcd_set_cmap(struct bmp_image *bmp, unsigned colors)
*cmap = (((cte.red) << 8) & 0xf800) |
(((cte.green) << 3) & 0x07e0) |
(((cte.blue) >> 3) & 0x001f);
*cmap = (((cte.red) << 8) & 0xf800) |
(((cte.green) << 3) & 0x07e0) |
(((cte.blue) >> 3) & 0x001f);
-#if defined(CONFIG_MPC823)
- cmap--;
-#else
cmap++;
cmap++;
-#endif
}
}
}
}
@@
-582,7
+563,7
@@
int lcd_display_bitmap(ulong bmp_image, int x, int y)
unsigned long pwidth = panel_info.vl_col;
unsigned colors, bpix, bmp_bpix;
int hdr_size;
unsigned long pwidth = panel_info.vl_col;
unsigned colors, bpix, bmp_bpix;
int hdr_size;
- struct bmp_color_table_entry *palette
= bmp->color_table
;
+ struct bmp_color_table_entry *palette;
if (!bmp || !(bmp->header.signature[0] == 'B' &&
bmp->header.signature[1] == 'M')) {
if (!bmp || !(bmp->header.signature[0] == 'B' &&
bmp->header.signature[1] == 'M')) {
@@
-591,6
+572,7
@@
int lcd_display_bitmap(ulong bmp_image, int x, int y)
return 1;
}
return 1;
}
+ palette = bmp->color_table;
width = get_unaligned_le32(&bmp->header.width);
height = get_unaligned_le32(&bmp->header.height);
bmp_bpix = get_unaligned_le16(&bmp->header.bit_count);
width = get_unaligned_le32(&bmp->header.width);
height = get_unaligned_le32(&bmp->header.height);
bmp_bpix = get_unaligned_le16(&bmp->header.bit_count);
@@
-704,7
+686,7
@@
int lcd_display_bitmap(ulong bmp_image, int x, int y)
}
break;
#endif /* CONFIG_BMP_16BPP */
}
break;
#endif /* CONFIG_BMP_16BPP */
-#if defined(CONFIG_BMP_24B
M
P)
+#if defined(CONFIG_BMP_24B
P
P)
case 24:
for (i = 0; i < height; ++i) {
for (j = 0; j < width; j++) {
case 24:
for (i = 0; i < height; ++i) {
for (j = 0; j < width; j++) {
@@
-716,7
+698,7
@@
int lcd_display_bitmap(ulong bmp_image, int x, int y)
fb -= lcd_line_length + width * (bpix / 8);
}
break;
fb -= lcd_line_length + width * (bpix / 8);
}
break;
-#endif /* CONFIG_BMP_24B
M
P */
+#endif /* CONFIG_BMP_24B
P
P */
#if defined(CONFIG_BMP_32BPP)
case 32:
for (i = 0; i < height; ++i) {
#if defined(CONFIG_BMP_32BPP)
case 32:
for (i = 0; i < height; ++i) {