leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: cmd: Drop old LCD code

Browse Source 
This relies on the old LCD implementation which is to be removed. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-10-16 15:57:41 -06:00 committed by Anatolij Gustschin
parent c31e0c62b1
commit f9b7bd7e91
3 changed files with 11 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/bmp.c
View File

@ -14,7 +14,6 @@
#include <dm.h> #include <dm.h>
#include <gzip.h> #include <gzip.h>
#include <image.h> #include <image.h>
#include <lcd.h>
#include <log.h> #include <log.h>
#include <malloc.h> #include <malloc.h>
#include <mapmem.h> #include <mapmem.h>
@ -223,9 +222,7 @@ static int bmp_info(ulong addr)
int bmp_display(ulong addr, int x, int y) int bmp_display(ulong addr, int x, int y)
{ {
#ifdef CONFIG_DM_VIDEO
struct udevice *dev; struct udevice *dev;
#endif
int ret; int ret;
struct bmp_image *bmp = map_sysmem(addr, 0); struct bmp_image *bmp = map_sysmem(addr, 0);
void *bmp_alloc_addr = NULL; void *bmp_alloc_addr = NULL;
@ -241,7 +238,6 @@ int bmp_display(ulong addr, int x, int y)
} }
addr = map_to_sysmem(bmp); addr = map_to_sysmem(bmp);
#ifdef CONFIG_DM_VIDEO
ret = uclass_first_device_err(UCLASS_VIDEO, &dev); ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
if (!ret) { if (!ret) {
bool align = false; bool align = false;
@ -251,11 +247,6 @@ int bmp_display(ulong addr, int x, int y)
ret = video_bmp_display(dev, addr, x, y, align); ret = video_bmp_display(dev, addr, x, y, align);
} }
#elif defined(CONFIG_LCD)
ret = lcd_display_bitmap(addr, x, y);
#else
# error bmp_display() requires CONFIG_LCD
#endif
if (bmp_alloc_addr) if (bmp_alloc_addr)
free(bmp_alloc_addr); free(bmp_alloc_addr);

27
common/board_f.c
View File

@ -28,7 +28,6 @@
#include <i2c.h> #include <i2c.h>
#include <init.h> #include <init.h>
#include <initcall.h> #include <initcall.h>
#include <lcd.h>
#include <log.h> #include <log.h>
#include <malloc.h> #include <malloc.h>
#include <mapmem.h> #include <mapmem.h>
@ -409,22 +408,18 @@ __weak int arch_reserve_mmu(void)
static int reserve_video(void) static int reserve_video(void)
{ {
#ifdef CONFIG_DM_VIDEO if (IS_ENABLED(CONFIG_DM_VIDEO)) {
ulong addr; ulong addr;
int ret; int ret;
addr = gd->relocaddr; addr = gd->relocaddr;
ret = video_reserve(&addr); ret = video_reserve(&addr);
if (ret) if (ret)
return ret; return ret;
debug("Reserving %luk for video at: %08lx\n", debug("Reserving %luk for video at: %08lx\n",
((unsigned long)gd->relocaddr - addr) >> 10, addr); ((unsigned long)gd->relocaddr - addr) >> 10, addr);
gd->relocaddr = addr; gd->relocaddr = addr;
#elif defined(CONFIG_LCD) }
/* reserve memory for LCD display (always full pages) */
gd->relocaddr = lcd_setmem(gd->relocaddr);
gd->fb_base = gd->relocaddr;
#endif
return 0; return 0;
} }

29
common/fdt_support.c
View File

@ -1740,35 +1740,6 @@ int fdt_set_status_by_pathf(void *fdt, enum fdt_status status, const char *fmt,
return fdt_set_node_status(fdt, offset, status); return fdt_set_node_status(fdt, offset, status);
} }
#if defined(CONFIG_LCD)
int fdt_add_edid(void *blob, const char *compat, unsigned char *edid_buf)
{
int noff;
int ret;
noff = fdt_node_offset_by_compatible(blob, -1, compat);
if (noff != -FDT_ERR_NOTFOUND) {
debug("%s: %s\n", fdt_get_name(blob, noff, 0), compat);
add_edid:
ret = fdt_setprop(blob, noff, "edid", edid_buf, 128);
if (ret == -FDT_ERR_NOSPACE) {
ret = fdt_increase_size(blob, 512);
if (!ret)
goto add_edid;
else
goto err_size;
} else if (ret < 0) {
printf("Can't add property: %s\n", fdt_strerror(ret));
return ret;
}
}
return 0;
err_size:
printf("Can't increase blob size: %s\n", fdt_strerror(ret));
return ret;
}
#endif
/* /*
* Verify the physical address of device tree node for a given alias * Verify the physical address of device tree node for a given alias
* *