diff options
| author | Tom Rini <[email protected]> | 2022-07-23 13:05:03 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-08-04 16:18:47 -0400 |
| commit | 17ead040d402c6e1fe26ac5acc4773146c8a0918 (patch) | |
| tree | 9bfa97577dc86a0947a2d07b455dbd6b0638ed21 /common | |
| parent | 1d3ecdac7ecd5d9b237067b0c96aa1e618c8621d (diff) | |
Audit <flash.h> inclusion
A large number of files include <flash.h> as it used to be how various
SPI flash related functions were found, or for other reasons entirely.
In order to migrate some further CONFIG symbols to Kconfig we need to
not include flash.h in cases where we don't have a NOR flash of some
sort enabled. Furthermore, in cases where we are in common code and it
doesn't make sense to try and further refactor the code itself in to new
files we need to guard this inclusion.
Signed-off-by: Tom Rini <[email protected]>
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 ed29069d2de..e702f0234ee 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 f939c2f9e95..848f44e59df 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 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) |