X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Fserial%2Fsandbox.c;h=858e340f5937d0b7b5031042893063f19a905bd0;hb=9d922450aa9944ecf8c249c892078cda80f40e02;hp=cd2f91e28e8f96b0d651cac208cbbe1c4fb12303;hpb=2a8c9c86b92a9ccee3c27286de317e19bb0530b3;p=oweals%2Fu-boot.git

diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index cd2f91e28e..858e340f59 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -16,6 +16,7 @@
 #include <lcd.h>
 #include <os.h>
 #include <serial.h>
+#include <video.h>
 #include <linux/compiler.h>
 #include <asm/state.h>
 
@@ -24,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 /*
  *
  *   serial_buf: A buffer that holds keyboard characters for the
- *		 Sandbox U-boot.
+ *		 Sandbox U-Boot.
  *
  * invariants:
  *   serial_buf_write		 == serial_buf_read -> empty buffer
@@ -114,8 +115,8 @@ static int sandbox_serial_pending(struct udevice *dev, bool input)
 		return 0;
 
 	os_usleep(100);
-#ifdef CONFIG_LCD
-	lcd_sync();
+#ifndef CONFIG_SPL_BUILD
+	video_sync_all();
 #endif
 	if (next_index == serial_buf_read)
 		return 1;	/* buffer full */
@@ -151,7 +152,7 @@ static int sandbox_serial_ofdata_to_platdata(struct udevice *dev)
 	int i;
 
 	plat->colour = -1;
-	colour = fdt_getprop(gd->fdt_blob, dev->of_offset,
+	colour = fdt_getprop(gd->fdt_blob, dev_of_offset(dev),
 			     "sandbox,text-colour", NULL);
 	if (colour) {
 		for (i = 0; i < ARRAY_SIZE(ansi_colour); i++) {