diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-21 08:32:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-21 08:32:02 -0500 |
| commit | 24b628a8f844868adca897aae40af6f98cdbc26d (patch) | |
| tree | 43572009123231107d618dce3a4f84d7e2c536d6 /board/xilinx/common/board.c | |
| parent | 55e9cef1432ffd42559874b2a469729f20b627d9 (diff) | |
| parent | 9bd4232f958b94fdd700e44897fb61bdc898b787 (diff) | |
Merge tag 'xilinx-for-v2022.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2022.04-rc3
microblaze:
- Fix exception handler
zynqmp:
- Show information about secure images
- DT changes (som u-boot file removal)
- Fix zynqmp_pm_cfg_obj_convert.py
- Fix platform boot
xilinx:
- Fix bootm_size calculation
- Remove GPIO_EXTRA_HEADER selection
power:
- Add zynqmp power management driver
scsi:
- Add phy support to ceva driver
zynq qspi:
- Fix unaligned accesses and check baudrate setup
- Add support for spi memory operations
net:
- Fix 64bit calculation in axi_emac
video:
- Add missing gpio dependency for seps driver
Diffstat (limited to 'board/xilinx/common/board.c')
| -rw-r--r-- | board/xilinx/common/board.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 78a5d0efa86..0068cb87926 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -319,7 +319,7 @@ __maybe_unused int xilinx_read_eeprom(void) return 0; } -#if defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE) +#if defined(CONFIG_OF_BOARD) void *board_fdt_blob_setup(int *err) { void *fdt_blob; @@ -355,6 +355,7 @@ void *board_fdt_blob_setup(int *err) debug("DTB is also not passed via %p\n", fdt_blob); + *err = -EINVAL; return NULL; } #endif @@ -377,7 +378,7 @@ int board_late_init_xilinx(void) u32 ret = 0; int i, id, macid = 0; struct xilinx_board_description *desc; - phys_size_t bootm_size = gd->ram_size; + phys_size_t bootm_size = gd->ram_top - gd->ram_base; if (!CONFIG_IS_ENABLED(MICROBLAZE)) { ulong scriptaddr; |