diff options
Diffstat (limited to 'board/xilinx')
| -rw-r--r-- | board/xilinx/common/board.c | 2 | ||||
| -rw-r--r-- | board/xilinx/zynq/board.c | 3 | ||||
| l--------- | board/xilinx/zynqmp/zynqmp-zcu1275-revA (renamed from board/xilinx/zynqmp/zynqmp-zc1275-revA) | 0 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp-zcu1275-revB/psu_init_gpl.c (renamed from board/xilinx/zynqmp/zynqmp-zc1275-revB/psu_init_gpl.c) | 0 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 7 |
5 files changed, 6 insertions, 6 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) diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 49ff3f0dc0..7533dddb9b 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -25,6 +25,9 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { + if (IS_ENABLED(CONFIG_SPL_BUILD)) + printf("Silicon version:\t%d\n", zynq_get_silicon_version()); + return 0; } diff --git a/board/xilinx/zynqmp/zynqmp-zc1275-revA b/board/xilinx/zynqmp/zynqmp-zcu1275-revA index 7abf1dc462..7abf1dc462 120000 --- a/board/xilinx/zynqmp/zynqmp-zc1275-revA +++ b/board/xilinx/zynqmp/zynqmp-zcu1275-revA diff --git a/board/xilinx/zynqmp/zynqmp-zc1275-revB/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu1275-revB/psu_init_gpl.c index d3eb713e9e..d3eb713e9e 100644 --- a/board/xilinx/zynqmp/zynqmp-zc1275-revB/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu1275-revB/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 43e322f715..4466717ad4 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -329,6 +329,7 @@ int board_init(void) if (sizeof(CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE) > 1) zynqmp_pmufw_load_config_object(zynqmp_pm_cfg_obj, zynqmp_pm_cfg_obj_size); + printf("Silicon version:\t%d\n", zynqmp_get_silicon_version()); #else if (CONFIG_IS_ENABLED(DM_I2C) && CONFIG_IS_ENABLED(I2C_EEPROM)) xilinx_read_eeprom(); @@ -496,11 +497,7 @@ static int reset_reason(void) env_set("reset_reason", reason); - ret = zynqmp_mmio_write((ulong)&crlapb_base->reset_reason, ~0, ~0); - if (ret) - return -EINVAL; - - return ret; + return 0; } static int set_fdtfile(void) |