diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-08 12:28:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-08 12:28:04 -0500 |
| commit | 531c00894577a0a852431adf61ade76925f8b162 (patch) | |
| tree | 37cde6437d2f64f49d5eec47cfccd36bb92d4146 /arch/arm/mach-k3/common.c | |
| parent | 8b139f4e1c08c4ffb1a8e739db128ed02cbc637f (diff) | |
| parent | f55d4978e130bbe488f031bcad2763ea90c372bd (diff) | |
Merge branch '2022-02-08-TI-platform-updates'
- J721S2 support, IPU support on DRA7, SIERRA PHY mulitlink
configuration support, Nokia RX-51 DM_KEYBOARD conversion
Diffstat (limited to 'arch/arm/mach-k3/common.c')
| -rw-r--r-- | arch/arm/mach-k3/common.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 39d00270b7f..b4b75f4e6c8 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -156,13 +156,15 @@ void init_env(void) #endif } -#ifdef CONFIG_FS_LOADER int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr) { struct udevice *fsdev; char *name = NULL; int size = 0; + if (!IS_ENABLED(CONFIG_FS_LOADER)) + return 0; + *loadaddr = 0; #ifdef CONFIG_SPL_ENV_SUPPORT switch (spl_boot_device()) { @@ -186,12 +188,6 @@ int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr) return size; } -#else -int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr) -{ - return 0; -} -#endif __weak void release_resources_for_core_shutdown(void) { |