diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-27 08:29:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-27 08:29:10 -0400 |
| commit | bbef20d479441b01d62252cf127498c58078b2c3 (patch) | |
| tree | 7818d7df29c6147d5270c0ee0a6ff1645917d1b6 /board | |
| parent | 0ae8dcfef7c890330c62bb34c724126ffc169bef (diff) | |
| parent | 3888c8d1979289efe685fe29276aed4d4b685975 (diff) | |
| download | u-boot-bbef20d479441b01d62252cf127498c58078b2c3.tar.gz u-boot-bbef20d479441b01d62252cf127498c58078b2c3.tar.xz u-boot-bbef20d479441b01d62252cf127498c58078b2c3.zip | |
Merge tag 'xilinx-for-v2018.11' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.11
- Handle BOARD_LATE_INIT via Kconfig
SPL:
- Enable GZIP for all partitions types(not only for kernel)
ZynqMP:
- Rearrange pmufw version handling
- Support newer PMUFW with improved fpga load sequence
Zynq:
- Cleanup config file
- Simplify zybo config by enabling option via Kconfig
net:
- Fix gems max-speed property reading
- Enable support for fixed-link phys
Diffstat (limited to 'board')
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 89fac6bb67..af91cde7c8 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -281,7 +281,16 @@ int board_early_init_f(void) { int ret = 0; #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_CLK_ZYNQMP) - zynqmp_pmufw_version(); + u32 pm_api_version; + + pm_api_version = zynqmp_pmufw_version(); + printf("PMUFW:\tv%d.%d\n", + pm_api_version >> ZYNQMP_PM_VERSION_MAJOR_SHIFT, + pm_api_version & ZYNQMP_PM_VERSION_MINOR_MASK); + + if (pm_api_version < ZYNQMP_PM_VERSION) + panic("PMUFW version error. Expected: v%d.%d\n", + ZYNQMP_PM_VERSION_MAJOR, ZYNQMP_PM_VERSION_MINOR); #endif #if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED) |