diff options
author | Tom Rini <trini@konsulko.com> | 2021-01-06 07:57:33 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-01-06 07:57:33 -0500 |
commit | bc0b99bd8b19599f670f42401de655fa9b44cd94 (patch) | |
tree | 8f5294dc16657c32b1a401c13a1f2a0579ac62e2 /cmd | |
parent | b11f634b1c1be6ab419758c6596c673445e5ac70 (diff) | |
parent | 0109db1cd1e63b35c1c84d6bc2ccaa26aa6b7ce3 (diff) | |
download | u-boot-bc0b99bd8b19599f670f42401de655fa9b44cd94.tar.gz u-boot-bc0b99bd8b19599f670f42401de655fa9b44cd94.tar.xz u-boot-bc0b99bd8b19599f670f42401de655fa9b44cd94.zip |
Merge tag 'xilinx-for-v2021.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next
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
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/load.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd/load.c b/cmd/load.c index 9a3a16979c..c6a7cc4651 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -228,12 +228,11 @@ static int read_record(char *buf, ulong len) *p = c; } - /* Check for the console hangup (if any different from serial) */ - if (gd->jt->getc != getchar) { - if (ctrlc()) { - return (-1); + /* Check for the console hangup (if any different from serial) */ + if (gd->jt->getc != getchar) { + if (ctrlc()) + return (-1); } - } } /* line too long - truncate */ |