diff options
| author | Simon Glass <sjg@chromium.org> | 2022-10-16 15:57:41 -0600 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2022-10-30 20:07:17 +0100 |
| commit | f9b7bd7e91ee5340611799846c92c698db4d28c4 (patch) | |
| tree | 5179114940642e7c4c8d9fd0c9b0aa9432c91d12 /common | |
| parent | c31e0c62b14d0fc651d31c93863fe6a421a3f78a (diff) | |
| download | u-boot-f9b7bd7e91ee5340611799846c92c698db4d28c4.tar.gz | |
video: cmd: Drop old LCD code
This relies on the old LCD implementation which is to be removed. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 27 | ||||
| -rw-r--r-- | common/fdt_support.c | 29 |
2 files changed, 11 insertions, 45 deletions
diff --git a/common/board_f.c b/common/board_f.c index 4355d1c82d..0f7354ddd6 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -28,7 +28,6 @@ #include <i2c.h> #include <init.h> #include <initcall.h> -#include <lcd.h> #include <log.h> #include <malloc.h> #include <mapmem.h> @@ -409,22 +408,18 @@ __weak int arch_reserve_mmu(void) static int reserve_video(void) { -#ifdef CONFIG_DM_VIDEO - ulong addr; - int ret; + if (IS_ENABLED(CONFIG_DM_VIDEO)) { + ulong addr; + int ret; - addr = gd->relocaddr; - ret = video_reserve(&addr); - if (ret) - return ret; - debug("Reserving %luk for video at: %08lx\n", - ((unsigned long)gd->relocaddr - addr) >> 10, 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 + addr = gd->relocaddr; + ret = video_reserve(&addr); + if (ret) + return ret; + debug("Reserving %luk for video at: %08lx\n", + ((unsigned long)gd->relocaddr - addr) >> 10, addr); + gd->relocaddr = addr; + } return 0; } diff --git a/common/fdt_support.c b/common/fdt_support.c index baf7fb7065..ebebffc789 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -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); } -#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 * |