efi: Drop old LCD code

This relies on the old LCD implementation which is to be removed. Drop the
existing #ifdef and convert it to C code.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c
index 20bd7ff..d1dc2f2 100644 (file)
--- a/lib/efi_loader/efi_gop.c
+++ b/lib/efi_loader/efi_gop.c
@@ -252,21 +252,13 @@ static efi_uintn_t gop_get_bpp(struct efi_gop *this)
        efi_uintn_t vid_bpp = 0;
 
        switch (gopobj->bpix) {
-#ifdef CONFIG_DM_VIDEO
        case VIDEO_BPP32:
-#else
-       case LCD_COLOR32:
-#endif
                if (gopobj->info.pixel_format == EFI_GOT_BGRA8)
                        vid_bpp = 32;
                else
                        vid_bpp = 30;
                break;
-#ifdef CONFIG_DM_VIDEO
        case VIDEO_BPP16:
-#else
-       case LCD_COLOR16:
-#endif
                vid_bpp = 16;
                break;
        }
@@ -476,8 +468,6 @@ efi_status_t efi_gop_register(void)
        u64 fb_base, fb_size;
        void *fb;
        efi_status_t ret;
-
-#ifdef CONFIG_DM_VIDEO
        struct udevice *vdev;
        struct video_priv *priv;
 
@@ -495,26 +485,10 @@ efi_status_t efi_gop_register(void)
        fb_base = (uintptr_t)priv->fb;
        fb_size = priv->fb_size;
        fb = priv->fb;
-#else
-       int line_len;
-
-       bpix = panel_info.vl_bpix;
-       format = VIDEO_UNKNOWN;
-       col = panel_info.vl_col;
-       row = panel_info.vl_row;
-       fb_base = gd->fb_base;
-       fb_size = lcd_get_size(&line_len);
-       fb = (void*)gd->fb_base;
-#endif
 
        switch (bpix) {
-#ifdef CONFIG_DM_VIDEO
        case VIDEO_BPP16:
        case VIDEO_BPP32:
-#else
-       case LCD_COLOR32:
-       case LCD_COLOR16:
-#endif
                break;
        default:
                /* So far, we only work in 16 or 32 bit mode */
@@ -553,11 +527,7 @@ efi_status_t efi_gop_register(void)
        gopobj->info.version = 0;
        gopobj->info.width = col;
        gopobj->info.height = row;
-#ifdef CONFIG_DM_VIDEO
        if (bpix == VIDEO_BPP32)
-#else
-       if (bpix == LCD_COLOR32)
-#endif
        {
                if (format == VIDEO_X2R10G10B10) {
                        gopobj->info.pixel_format = EFI_GOT_BITMASK;

diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index 9d71893..0b7372e 100644 (file)
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -326,11 +326,11 @@ efi_status_t efi_init_obj_list(void)
                        goto out;
        }
 
-#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
-       ret = efi_gop_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
+       if (IS_ENABLED(CONFIG_DM_VIDEO)) {
+               ret = efi_gop_register();
+               if (ret != EFI_SUCCESS)
+                       goto out;
+       }
 #ifdef CONFIG_NET
        ret = efi_net_register();
        if (ret != EFI_SUCCESS)