diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2020-10-26 12:26:13 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2020-10-29 08:55:43 +0100 |
| commit | 05af4834ad6b78377cb5eb50659a5d08b83e3813 (patch) | |
| tree | 206600a1f2ced4a0f258ce1e03594da515945c65 | |
| parent | 728d21b8c75e3c13a19b4a555d08a4478efa8fe6 (diff) | |
| download | u-boot-05af4834ad6b78377cb5eb50659a5d08b83e3813.tar.gz | |
xilinx: Consolidate board_fit_config_name_match() for Xilinx platforms
Move board_fit_config_name_match() from Zynq/ZynqMP to common location.
This change will open a way to use it also by Microblaze and Versal.
Through this function there is a way to handle images with multiple DTBs.
For now match it with DEVICE_TREE as is done for Zynq.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| -rw-r--r-- | arch/arm/mach-zynq/spl.c | 14 | ||||
| -rw-r--r-- | arch/arm/mach-zynqmp/spl.c | 10 | ||||
| -rw-r--r-- | board/xilinx/common/board.c | 11 |
3 files changed, 11 insertions, 24 deletions
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index cb8cfd2f35..d09141c3bc 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -9,7 +9,6 @@ #include <init.h> #include <log.h> #include <spl.h> -#include <generated/dt.h> #include <asm/io.h> #include <asm/spl.h> @@ -86,16 +85,3 @@ void spl_board_prepare_for_boot(void) ps7_post_config(); debug("SPL bye\n"); } - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ - /* Just empty function now - can't decide what to choose */ - debug("%s: Check %s, default %s\n", __func__, name, DEVICE_TREE); - - if (!strcmp(name, DEVICE_TREE)) - return 0; - - return -1; -} -#endif diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index 9dd61e25f6..88386b23e5 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -119,13 +119,3 @@ int spl_start_uboot(void) return 0; } #endif - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ - /* Just empty function now - can't decide what to choose */ - debug("%s: %s\n", __func__, name); - - return -1; -} -#endif diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index bcdd3ae4f1..cdc06a39ce 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -16,6 +16,7 @@ #include <dm.h> #include <i2c_eeprom.h> #include <net.h> +#include <generated/dt.h> #include "fru.h" @@ -425,3 +426,13 @@ int board_late_init_xilinx(void) return 0; } #endif + +int __maybe_unused board_fit_config_name_match(const char *name) +{ + debug("%s: Check %s, default %s\n", __func__, name, DEVICE_TREE); + + if (!strcmp(name, DEVICE_TREE)) + return 0; + + return -1; +} |