aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2022-02-17 14:28:38 +0100
committerMichal Simek <michal.simek@xilinx.com>2022-02-21 13:14:02 +0100
commitf063100593942a33d8bf40dbc95b4b44e417a368 (patch)
tree5b9f840d105f765a97cb45dab4b9a46c75b455cd /board
parentd1114b83405ceaccd46bce96001e6da4fab3ae40 (diff)
downloadu-boot-f063100593942a33d8bf40dbc95b4b44e417a368.zip
u-boot-f063100593942a33d8bf40dbc95b4b44e417a368.tar.gz
u-boot-f063100593942a33d8bf40dbc95b4b44e417a368.tar.bz2
xilinx: Enable OF_BOARD for zynq and zynqmp boards
The commit 985503439762 ("fdt: Don't call board_fdt_blob_setup() without OF_BOARD") forced to enable OF_BOARD for platforms which provide DT externally. Zynq/ZynqMP boards are using this feature for a long time that's why there is a need to enable it by default. Also code expects to return error in case of error that's why also fill it. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Link: https://lore.kernel.org/r/9f11bbffe2849f4da7d72712082d579262fe8fd8.1645104518.git.michal.simek@xilinx.com
Diffstat (limited to 'board')
-rw-r--r--board/xilinx/common/board.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 6fce231..0068cb8 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -319,7 +319,7 @@ __maybe_unused int xilinx_read_eeprom(void)
return 0;
}
-#if defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
+#if defined(CONFIG_OF_BOARD)
void *board_fdt_blob_setup(int *err)
{
void *fdt_blob;
@@ -355,6 +355,7 @@ void *board_fdt_blob_setup(int *err)
debug("DTB is also not passed via %p\n", fdt_blob);
+ *err = -EINVAL;
return NULL;
}
#endif