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>

diff --git a/cmd/bmp.c b/cmd/bmp.c
index 880edad8898eb7b45a2074033bb83483cbaa96c4..46d0d916e86f06eef38a4bd79b1064a045ec2d91 100644 (file)
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -14,7 +14,6 @@
 #include <dm.h>
 #include <gzip.h>
 #include <image.h>
-#include <lcd.h>
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
@@ -223,9 +222,7 @@ static int bmp_info(ulong addr)
 
 int bmp_display(ulong addr, int x, int y)
 {
-#ifdef CONFIG_DM_VIDEO
        struct udevice *dev;
-#endif
        int ret;
        struct bmp_image *bmp = map_sysmem(addr, 0);
        void *bmp_alloc_addr = NULL;
@@ -241,7 +238,6 @@ int bmp_display(ulong addr, int x, int y)
        }
        addr = map_to_sysmem(bmp);
 
-#ifdef CONFIG_DM_VIDEO
        ret = uclass_first_device_err(UCLASS_VIDEO, &dev);
        if (!ret) {
                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);
        }
-#elif defined(CONFIG_LCD)
-       ret = lcd_display_bitmap(addr, x, y);
-#else
-# error bmp_display() requires CONFIG_LCD
-#endif
 
        if (bmp_alloc_addr)
                free(bmp_alloc_addr);

diff --git a/common/board_f.c b/common/board_f.c
index 4355d1c82d4bc29a0695a712203ceee5f5abfde4..0f7354ddd68aaa5fdc83ff93093a67fcbfdc925a 100644 (file)
--- 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 baf7fb70659ded7e05d361deb6aa87035858ed4f..ebebffc789043c0271f78346bc2ba00b679750bd 100644 (file)
--- 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
  *