diff options
| author | Tom Rini <trini@konsulko.com> | 2022-08-04 16:53:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-04 16:54:01 -0400 |
| commit | b8e09898919e23c5d7f1934be7bf9a3a6f0deb0e (patch) | |
| tree | ba1c168b729947aec2a487791e5a26ce72da4282 /common/update.c | |
| parent | 62e6418031bed3671e57e63d49273e2739a82589 (diff) | |
| parent | 78475d2572615471d3c047e61481a68859d0dd7f (diff) | |
Merge branch '2022-08-04-Kconfig-migrations'
- Further migrations to Kconfig and associated dead code removal.
Diffstat (limited to 'common/update.c')
| -rw-r--r-- | common/update.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/update.c b/common/update.c index b9ad475d9d4..80f16af6535 100644 --- a/common/update.c +++ b/common/update.c @@ -20,14 +20,12 @@ #include <command.h> #include <env.h> -#include <flash.h> #include <net.h> #include <net/tftp.h> #include <malloc.h> #include <mapmem.h> #include <dfu.h> #include <errno.h> -#include <mtd/cfi_flash.h> #if defined(CONFIG_DFU_TFTP) || defined(CONFIG_UPDATE_TFTP) /* env variable holding the location of the update file */ @@ -49,7 +47,8 @@ extern ulong tftp_timeout_ms; extern int tftp_timeout_count_max; #ifdef CONFIG_MTD_NOR_FLASH -extern flash_info_t flash_info[]; +#include <flash.h> +#include <mtd/cfi_flash.h> static uchar *saved_prot_info; #endif static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) |