diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-23 10:45:55 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-23 10:45:55 -0500 |
| commit | cbe607b920bc0827d8fe379ed4f5ae4e2058513e (patch) | |
| tree | b8cdbb8856766675f37bb92f27ab9c662fa647f9 /board/xilinx/common/board.c | |
| parent | 8f7a16aac36c2a38956bd04b53cb7b94b7a70180 (diff) | |
| parent | d9aa19efa8a6c20d51b7884de0a7f8dae3f835d2 (diff) | |
Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2021.04-rc3
qspi:
- Support for dual/quad mode
- Fix speed handling
clk:
- Add clock enable function for zynq/zynqmp/versal
gem:
- Enable clock for Versal
- Fix error path
- Fix mdio deregistration path
fpga:
- Fix buffer alignment for ZynqMP
xilinx:
- Fix reset reason clearing in ZynqMP
- Show silicon version in SPL for Zynq/ZynqMP
- Fix DTB selection for ZynqMP
- Rename zc1275 to zcu1275 to match DT name
Diffstat (limited to 'board/xilinx/common/board.c')
| -rw-r--r-- | board/xilinx/common/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 4a83d93a85..475628b925 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -327,7 +327,7 @@ void *board_fdt_blob_setup(void) if (!IS_ENABLED(CONFIG_SPL_BUILD) && !IS_ENABLED(CONFIG_VERSAL_NO_DDR) && - !IS_ENABLED(CONFIG_VERSAL_NO_DDR)) { + !IS_ENABLED(CONFIG_ZYNQMP_NO_DDR)) { fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR; if (fdt_magic(fdt_blob) == FDT_MAGIC) |