diff options
author | Tom Rini <trini@konsulko.com> | 2020-06-25 09:33:39 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-06-25 09:33:39 -0400 |
commit | f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3 (patch) | |
tree | 393f3a5a757c2faf8e1506a6a94e70d253b591dd /common/board_f.c | |
parent | 6ccbd1590fb15b673c90c9ccde5da8dcaaf80a10 (diff) | |
parent | b8fd54d62f92658cbd20ca051304e13eabf24ddd (diff) | |
download | u-boot-f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3.tar.gz u-boot-f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3.tar.xz u-boot-f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3.zip |
Merge tag 'xilinx-for-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next
Xilinx changes for v2020.10
Versal:
- xspi bootmode fix
- Removing one clock from clk driver
- Align u-boot memory setting with OS by default
- Map TCM and OCM by default
ZynqMP:
- Minor DT improvements
- Reduce console buffer for mini configurations
- Add fix for AMS
- Add support for XDP platform
Zynq:
- Support for AES engine
- Enable bigger memory test by default
- Extend documentation for SD preparation
- Use different freq for Topic miami board
mmc:
- minor GD pointer removal
net:
- Support fixed-link cases by zynq gem
- Fix phy looking loop in axi enet driver
spi:
- Cleanup global macros for xilinx spi drivers
firmware:
- Add support for pmufw reloading
fpga:
- Improve error status reporting
common:
- Remove 4kB addition space for FDT allocation
Diffstat (limited to 'common/board_f.c')
-rw-r--r-- | common/board_f.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c index 01194eaa0e..dcad551ae4 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -537,7 +537,7 @@ static int reserve_fdt(void) * will be relocated with other data. */ if (gd->fdt_blob) { - gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32); + gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob), 32); gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size); gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); |