From 70cc7b614f620e95edf304ee02f03f6dcf53e19c Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Tue, 18 Oct 2022 07:10:26 -0600
Subject: video: Drop use of the lcd header file

This file is being removed so drop remaining references to it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 boot/pxe_utils.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'boot/pxe_utils.c')

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index d5c215ae2c1..3fdd14d1cdb 100644
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -12,7 +12,6 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
-#include <lcd.h>
 #include <net.h>
 #include <fdt_support.h>
 #include <video.h>
-- 
cgit v1.2.3


From b86986c7b314f1378ca5be8df49310a6ce7302f8 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Tue, 18 Oct 2022 07:46:31 -0600
Subject: video: Rename CONFIG_DM_VIDEO to CONFIG_VIDEO

Now that all the old code is gone, rename this option. Driver model
migration is now complete.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 boot/pxe_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boot/pxe_utils.c')

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index 3fdd14d1cdb..8133006875f 100644
--- a/boot/pxe_utils.c
+++ b/boot/pxe_utils.c
@@ -1518,7 +1518,7 @@ void handle_pxe_menu(struct pxe_context *ctx, struct pxe_menu *cfg)
 		/* display BMP if available */
 		if (cfg->bmp) {
 			if (get_relfile(ctx, cfg->bmp, image_load_addr, NULL)) {
-#if defined(CONFIG_DM_VIDEO)
+#if defined(CONFIG_VIDEO)
 				struct udevice *dev;
 
 				err = uclass_first_device_err(UCLASS_VIDEO, &dev);
-- 
cgit v1.2.3