diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-20 22:14:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-20 22:14:29 -0500 |
| commit | 8e51bf746a11d7f67416859da73a83109af4e0a3 (patch) | |
| tree | 95351fb3819745d39c60944412e66529b31170bd /arch/arm/mach-rockchip/spl.c | |
| parent | 4246fae418f213d13ddd1829367183e94b5a7942 (diff) | |
| parent | f9561d8e3671415c7780df4b5e70f0f1e2d2bf57 (diff) | |
Merge tag 'u-boot-rockchip-20200220' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- rk3399: split roc-pc-rk3399 out of evb_rk3399
- sync dts from upstream kernel for rk3399,rk3288,px30
- boot_mode: find the saradc device name
Diffstat (limited to 'arch/arm/mach-rockchip/spl.c')
| -rw-r--r-- | arch/arm/mach-rockchip/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 7d0e6fa1aff..48ab0e60c63 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -147,7 +147,7 @@ void board_init_f(ulong dummy) } #ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) +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); |