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 /fs | |
| 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 'fs')
| -rw-r--r-- | fs/cramfs/cramfs.c | 3 | ||||
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index 7ef48bbc064..6c017cebc50 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -25,7 +25,6 @@ */ #include <common.h> -#include <flash.h> #include <malloc.h> #include <asm/byteorder.h> #include <linux/stat.h> @@ -43,7 +42,7 @@ struct cramfs_super super; /* CPU address space offset calculation macro, struct part_info offset is * device address space offset, so we need to shift it by a device start address. */ #if defined(CONFIG_MTD_NOR_FLASH) -extern flash_info_t flash_info[]; +#include <flash.h> #define PART_OFFSET(x) ((ulong)x->offset + \ flash_info[x->dev->id->num].start[0]) #else diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 1818e812156..ef7b302725c 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -113,7 +113,6 @@ #include <common.h> #include <config.h> -#include <flash.h> #include <malloc.h> #include <div64.h> #include <linux/compiler.h> @@ -381,6 +380,8 @@ static void put_fl_mem_onenand(void *buf) #if defined(CONFIG_CMD_FLASH) +#include <flash.h> + /* * Support for jffs2 on top of NOR-flash * @@ -392,7 +393,6 @@ static inline void *get_fl_mem_nor(u32 off, u32 size, void *ext_buf) u32 addr = off; struct mtdids *id = current_part->dev->id; - extern flash_info_t flash_info[]; flash_info_t *flash = &flash_info[id->num]; addr += flash->start[0]; |