diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-15 09:38:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-15 09:38:06 -0400 |
| commit | d94e89c7650f496ce1e9303093c1e2d268d91b1b (patch) | |
| tree | 36e556587e05858de00cc837f98122d80bdecf1f /board/xilinx | |
| parent | 9d0dc69235e8327dba5536761c768d40c4e514e5 (diff) | |
| parent | b729ed0d95415bd694a6b67c0761f03ef5a1e2bc (diff) | |
Merge tag 'xilinx-for-v2018.07-rc2' of git://git.denx.de/u-boot-microblaze
Xilinx fixes for v2018.07-rc2
Zynq:
- Fix missing watchdog header
- DT fixes
ZynqMP:
- emmc configuration split
- Enable SPD
- Fix PMUFW_INIT_FILE logic
- Coverity fixes in SoC code
timer
- Add timer_get_boot_us
mmc:
- Fix MMC HS200 tuning command
serial:
- Fix scrabled chars with OF_LIVE
Diffstat (limited to 'board/xilinx')
| -rw-r--r-- | board/xilinx/zynq/board.c | 1 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index e4f86d187a..1106f5c2a8 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -9,6 +9,7 @@ #include <fdtdec.h> #include <fpga.h> #include <mmc.h> +#include <watchdog.h> #include <wdt.h> #include <zynqpl.h> #include <asm/arch/hardware.h> diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 080fb59ef7..81c10fcf8a 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -596,6 +596,8 @@ int board_late_init(void) new_targets = calloc(1, strlen(mode) + env_targets_len + 2 + bootseq_len); + if (!new_targets) + return -ENOMEM; if (bootseq >= 0) sprintf(new_targets, "%s%x %s", mode, bootseq, |