diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 2 | ||||
| -rw-r--r-- | common/flash.c | 2 | ||||
| -rw-r--r-- | common/update.c | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/common/board_r.c b/common/board_r.c index ed29069d2d..e702f0234e 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -14,7 +14,9 @@ #include <bootstage.h> #include <cpu_func.h> #include <exports.h> +#ifdef CONFIG_MTD_NOR_FLASH #include <flash.h> +#endif #include <hang.h> #include <image.h> #include <irq_func.h> diff --git a/common/flash.c b/common/flash.c index f939c2f9e9..848f44e59d 100644 --- a/common/flash.c +++ b/common/flash.c @@ -13,8 +13,6 @@ #include <mtd/cfi_flash.h> -extern flash_info_t flash_info[]; /* info for FLASH chips */ - /*----------------------------------------------------------------------- * Functions */ diff --git a/common/update.c b/common/update.c index b9ad475d9d..80f16af653 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) |