projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: Use dm.h header when driver mode is used
[oweals/u-boot.git]
/
drivers
/
serial
/
sandbox.c
diff --git
a/drivers/serial/sandbox.c
b/drivers/serial/sandbox.c
index cd2f91e28e8f96b0d651cac208cbbe1c4fb12303..858e340f5937d0b7b5031042893063f19a905bd0 100644
(file)
--- a/
drivers/serial/sandbox.c
+++ b/
drivers/serial/sandbox.c
@@
-16,6
+16,7
@@
#include <lcd.h>
#include <os.h>
#include <serial.h>
#include <lcd.h>
#include <os.h>
#include <serial.h>
+#include <video.h>
#include <linux/compiler.h>
#include <asm/state.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
/*
*
* serial_buf: A buffer that holds keyboard characters for the
- * Sandbox U-
b
oot.
+ * Sandbox U-
B
oot.
*
* invariants:
* serial_buf_write == serial_buf_read -> empty buffer
*
* 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);
return 0;
os_usleep(100);
-#if
def CONFIG_LC
D
-
lcd_sync
();
+#if
ndef CONFIG_SPL_BUIL
D
+
video_sync_all
();
#endif
if (next_index == serial_buf_read)
return 1; /* buffer full */
#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;
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++) {
"sandbox,text-colour", NULL);
if (colour) {
for (i = 0; i < ARRAY_SIZE(ansi_colour); i++) {