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>

diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 514cb60d5ba0349e31f66f4807d12674650ac1a1..770f3d7d0d55964750c8b410e2128c5324a267ce 100644 (file)
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -9,6 +9,8 @@
  * Author: Fabio Estevam <fabio.estevam@freescale.com>
  */
 
+#include <common.h>
+#include <bmp_layout.h>
 #include <command.h>
 #include <image.h>
 #include <init.h>
@@ -33,12 +35,12 @@
 #include <i2c.h>
 #include <micrel.h>
 #include <miiphy.h>
-#include <lcd.h>
 #include <led.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/da9063_pmic.h>
 #include <splash.h>
+#include <video.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c
index db1075a594ac936eb1909a7ee958ffacda07e85a..d47c7b5f1eb1b82e68d59bd5a8b4ceafb689e48a 100644 (file)
--- a/board/l+g/vinco/vinco.c
+++ b/board/l+g/vinco/vinco.c
@@ -24,7 +24,6 @@
 #include <asm/arch/sama5d4.h>
 #include <atmel_hlcdc.h>
 #include <atmel_mci.h>
-#include <lcd.h>
 #include <mmc.h>
 #include <net.h>
 #include <netdev.h>

diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c
index dd56a39cafbda0513c0078a4f692cbe59b805c4f..52236792e24da3f14d7b7c33d332f97620c22c65 100644 (file)
--- a/board/nvidia/harmony/harmony.c
+++ b/board/nvidia/harmony/harmony.c
@@ -5,7 +5,6 @@
  */
 
 #include <common.h>
-#include <lcd.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/funcmux.h>

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 00afb352bd1ee01d70a0d875c8eb495489c3dd28..8603c93de771ded3ef3a932a3aaa5efc5e02cb7a 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -11,7 +11,6 @@
 #include <fdt_support.h>
 #include <fdt_simplefb.h>
 #include <init.h>
-#include <lcd.h>
 #include <memalign.h>
 #include <mmc.h>
 #include <asm/gpio.h>

diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c
index 2ab23f2f4f771dbaac28aa897b4794c41b07fea5..4cfb29ef428b7fdf4370d88e4379b792ac2193d1 100644 (file)
--- a/board/st/stm32f746-disco/stm32f746-disco.c
+++ b/board/st/stm32f746-disco/stm32f746-disco.c
@@ -7,7 +7,6 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
-#include <lcd.h>
 #include <log.h>
 #include <miiphy.h>
 #include <phy_interface.h>

diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c
index d5c215ae2c1d377e30892ba14760f4ec8fb3ced7..3fdd14d1cdb6e312d8512bcc1781b69107ed5a63 100644 (file)
--- 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>

diff --git a/common/splash.c b/common/splash.c
index 5206e35f74d09b2f4620e7594acea1ac46ff097f..8a55dd3847284c061b97d37f3e006b540e8553d1 100644 (file)
--- a/common/splash.c
+++ b/common/splash.c
@@ -24,7 +24,7 @@
 #include <display_options.h>
 #include <env.h>
 #include <splash.h>
-#include <lcd.h>
+#include <video.h>
 
 static struct splash_location default_splash_locations[] = {
        {
@@ -155,8 +155,7 @@ void splash_display_banner(void)
 
 /*
  * Common function to show a splash image if env("splashimage") is set.
- * Is used for both dm_video and lcd video stacks. For additional
- * details please refer to doc/README.splashprepare.
+ * For additional details please refer to doc/README.splashprepare.
  */
 #if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP)
 int splash_display(void)

diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 13b54921c419be21cc07458287e4cc8d8a7579ac..f122e3f7c360c7f12b7cc7ea297e1ef1ecdd83e8 100644 (file)
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -12,7 +12,6 @@
 #include <common.h>
 #include <console.h>
 #include <dm.h>
-#include <lcd.h>
 #include <os.h>
 #include <serial.h>
 #include <video.h>