diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-29 11:31:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-29 11:31:06 -0400 |
| commit | f3a0d2c1af630cc09a34c2159aa2dfa12b831762 (patch) | |
| tree | 08a339ed98c9daeb06d4471ea6a01b42cae37842 /board/xilinx/common/board.c | |
| parent | 3d2f8bc673d8a8c0ecb2ba27d21f8c54152281ca (diff) | |
| parent | b00bad9dc81ee0337761cc50443dffa22a6cdedf (diff) | |
Merge tag 'xilinx-for-v2021.07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2021.07-rc2
xilinx:
- Enable saving variables based on bootmode
- Cleanup usb dfu setup and wire it up with usb bootmode
- Fix bootscript address logic
- Remove GD references (spi, Versal)
- Enable capsule update
clk:
- Small Kconfig fix
net:
- Fix gmii2rgmii bridge binding
usb:
- Propagate error (dfu gadget)
Diffstat (limited to 'board/xilinx/common/board.c')
| -rw-r--r-- | board/xilinx/common/board.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 475628b925..92b61d83ca 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -378,14 +378,12 @@ int board_late_init_xilinx(void) int i, id, macid = 0; struct xilinx_board_description *desc; phys_size_t bootm_size = gd->ram_size; - struct bd_info *bd = gd->bd; - if (!CONFIG_IS_ENABLED(MICROBLAZE) && bd->bi_dram[0].start) { + if (!CONFIG_IS_ENABLED(MICROBLAZE)) { ulong scriptaddr; scriptaddr = env_get_hex("scriptaddr", 0); - ret |= env_set_hex("scriptaddr", - bd->bi_dram[0].start + scriptaddr); + ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr); } if (CONFIG_IS_ENABLED(ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) |