diff options
| author | Tom Rini <[email protected]> | 2020-12-03 09:43:47 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-12-03 09:43:47 -0500 |
| commit | ee1e04558ff8c8ed812b986939447f129bb0b0bb (patch) | |
| tree | 3a8e867ec03a87263834725b5815c43465a81f88 /common | |
| parent | ab31883ae7e54ded8396b13a9057f861bf916ea4 (diff) | |
| parent | a6cd384b9c37596ca9035f26922dd65991ddcb85 (diff) | |
Merge branch '2020-12-02-master-imports'
- Assorted minor fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/update.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/update.c b/common/update.c index 808be0880df..a5879cb52c4 100644 --- a/common/update.c +++ b/common/update.c @@ -29,7 +29,7 @@ #include <errno.h> #include <mtd/cfi_flash.h> -#ifdef CONFIG_DFU_TFTP +#if defined(CONFIG_DFU_TFTP) || defined(CONFIG_UPDATE_TFTP) /* env variable holding the location of the update file */ #define UPDATE_FILE_ENV "updatefile" @@ -99,7 +99,6 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) return rv; } -#endif /* CONFIG_DFU_TFTP */ #ifdef CONFIG_MTD_NOR_FLASH static int update_flash_protect(int prot, ulong addr_first, ulong addr_last) @@ -216,6 +215,7 @@ static int update_flash(ulong addr_source, ulong addr_first, ulong size) #endif return 0; } +#endif /* CONFIG_DFU_TFTP || CONFIG_UPDATE_TFTP */ static int update_fit_getparams(const void *fit, int noffset, ulong *addr, ulong *fladdr, ulong *size) @@ -233,7 +233,7 @@ static int update_fit_getparams(const void *fit, int noffset, ulong *addr, return 0; } -#ifdef CONFIG_DFU_TFTP +#if defined(CONFIG_DFU_TFTP) || defined(CONFIG_UPDATE_TFTP) int update_tftp(ulong addr, char *interface, char *devstring) { char *filename, *env_addr, *fit_image_name; @@ -340,7 +340,7 @@ next_node: return ret; } -#endif /* CONFIG_DFU_UPDATE */ +#endif /* CONFIG_DFU_UPDATE || CONFIG_UPDATE_TFTP */ #ifdef CONFIG_UPDATE_FIT /** |