diff options
author | Tom Rini <trini@konsulko.com> | 2021-04-15 17:10:25 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-04-15 17:10:25 -0400 |
commit | a6232e065dd9e349bf5908c928734c6b5b018112 (patch) | |
tree | 49a54d23fc32194ce266f06cb8fae3eff4574339 /arch | |
parent | 45b3cf88da24206a6cb847efe837fddc120af3e8 (diff) | |
parent | fbc777429fa35312a9ea5f106692172d3153e659 (diff) | |
download | u-boot-a6232e065dd9e349bf5908c928734c6b5b018112.zip u-boot-a6232e065dd9e349bf5908c928734c6b5b018112.tar.gz u-boot-a6232e065dd9e349bf5908c928734c6b5b018112.tar.bz2 |
Merge branch '2021-04-14-assorted-vboot-improvements'WIP/15Apr2021
- Add ECDSA support to FIT images
- Improve FIT image loadables (incl fpga) support
- Further FIT improvements with SPL
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/spl.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-rockchip/spl.c | 10 |
2 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 01dd6a3..5b43a2a 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -150,13 +150,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 4b5c22d..02c40fb 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 |