| Message ID | 20210331183227.2159361-1-sean.anderson@seco.com |
|---|---|
| State | Accepted |
| Commit | d442f69399996d426cdc45ce40bcf1e48d9cd8b9 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | common: fit: Add weak board_fit_config_name_match | expand |
On Wed, Mar 31, 2021 at 02:32:27PM -0400, Sean Anderson wrote: > Several architectures had a default board_fit_config_name_match already; > this provides a generic weak version. We default to rejecting all configs. > This will use the FIT's default config, instead of the first config. This > may result in boot failures if there are multiple configurations and the > first config is *not* the default. > > Signed-off-by: Sean Anderson <sean.anderson@seco.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index d5131bcf4b..46e8af8ebd 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -139,13 +139,4 @@ int spl_start_uboot(void) return 1; } #endif /* CONFIG_SPL_OS_BOOT */ -#ifdef CONFIG_SPL_LOAD_FIT -__weak 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 0; -} -#endif #endif /* CONFIG_SPL_BUILD */ diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 4b5c22dc13..02c40fb37e 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -151,13 +151,3 @@ void board_init_f(ulong dummy) #endif preloader_console_init(); } - -#ifdef CONFIG_SPL_LOAD_FIT -int __weak 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 0; -} -#endif diff --git a/common/common_fit.c b/common/common_fit.c index 219674d467..cde2dc45e9 100644 --- a/common/common_fit.c +++ b/common/common_fit.c @@ -22,6 +22,11 @@ ulong fdt_getprop_u32(const void *fdt, int node, const char *prop) return fdt32_to_cpu(*cell); } +__weak int board_fit_config_name_match(const char *name) +{ + return -EINVAL; +} + /* * Iterate over all /configurations subnodes and call a platform specific * function to find the matching configuration.
Several architectures had a default board_fit_config_name_match already; this provides a generic weak version. We default to rejecting all configs. This will use the FIT's default config, instead of the first config. This may result in boot failures if there are multiple configurations and the first config is *not* the default. Signed-off-by: Sean Anderson <sean.anderson@seco.com> --- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 9 --------- arch/arm/mach-rockchip/spl.c | 10 ---------- common/common_fit.c | 5 +++++ 3 files changed, 5 insertions(+), 19 deletions(-)