ChuanN-sudo/u-boot
1
0
Fork 0
forked from OERV-BSP/u-boot
Code Pull Requests Activity

Merge tag 'xilinx-for-v2021.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next

Browse Source 
Xilinx changes for v2021.04

arm64:
- DT updates

microblaze:
- Add support for NOR device support

spi:
- Fix unaligned data write issue

nand:
- Minor code change

xilinx:
- Fru fix in limit calculation
- Fill git repo link for all Xilinx boards

video:
- Add support for seps525 spi display

tools:
- Minor Vitis file support

cmd/common
- Minor code indentation fixes

serial:
- Uartlite debug uart initialization fix
This commit is contained in:
Tom Rini
2021-01-06 07:57:33 -05:00
parent b11f634b1c 0109db1cd1
commit bc0b99bd8b
25 changed files with 540 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/video/vidconsole-uclass.c
View File

@@ -89,9 +89,7 @@ static int vidconsole_back(struct udevice *dev)
if (priv->ycur < 0)
priv->ycur = 0;
}
video_sync(dev->parent, false);
return 0;
return video_sync(dev->parent, false);
}
/* Move to a newline, scrolling the display if necessary */
@@ -101,7 +99,7 @@ static void vidconsole_newline(struct udevice *dev)
struct udevice *vid_dev = dev->parent;
struct video_priv *vid_priv = dev_get_uclass_priv(vid_dev);
const int rows = CONFIG_CONSOLE_SCROLL_LINES;
int i;
int i, ret;
priv->xcur_frac = priv->xstart_frac;
priv->ycur += priv->y_charsize;
@@ -116,7 +114,12 @@ static void vidconsole_newline(struct udevice *dev)
}
priv->last_ch = 0;
video_sync(dev->parent, false);
ret = video_sync(dev->parent, false);
if (ret) {
#ifdef DEBUG
console_puts_select_stderr(true, "[vc err: video_sync]");
#endif
}
}
static const struct vid_rgb colors[VID_COLOR_COUNT] = {
@@ -348,8 +351,15 @@ static void vidconsole_escape_char(struct udevice *dev, char ch)
parsenum(priv->escape_buf + 1, &mode);
if (mode == 2) {
int ret;
video_clear(dev->parent);
video_sync(dev->parent, false);
ret = video_sync(dev->parent, false);
if (ret) {
#ifdef DEBUG
console_puts_select_stderr(true, "[vc err: video_sync]");
#endif
}
priv->ycur = 0;
priv->xcur_frac = priv->xstart_frac;
} else {
@@ -565,7 +575,12 @@ static void vidconsole_putc(struct stdio_dev *sdev, const char ch)
console_puts_select_stderr(true, "[vc err: putc]");
#endif
}
video_sync(dev->parent, false);
ret = video_sync(dev->parent, false);
if (ret) {
#ifdef DEBUG
console_puts_select_stderr(true, "[vc err: video_sync]");
#endif
}
}
static void vidconsole_puts(struct stdio_dev *sdev, const char *s)
@@ -582,7 +597,12 @@ static void vidconsole_puts(struct stdio_dev *sdev, const char *s)
console_puts_select_stderr(true, str);
#endif
}
video_sync(dev->parent, false);
ret = video_sync(dev->parent, false);
if (ret) {
#ifdef DEBUG
console_puts_select_stderr(true, "[vc err: video_sync]");
#endif
}
}
/* Set up the number of rows and colours (rotated drivers override this) */
@@ -691,9 +711,7 @@ static int do_video_puts(struct cmd_tbl *cmdtp, int flag, int argc,
for (s = argv[1]; *s; s++)
vidconsole_put_char(dev, *s);
video_sync(dev->parent, false);
return 0;
return video_sync(dev->parent, false);
}
U_BOOT_CMD(