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 /include | |
| 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 'include')
| -rw-r--r-- | include/flash.h | 5 | ||||
| -rw-r--r-- | include/mtd/cfi_flash.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/flash.h b/include/flash.h index f3959f50120..95992fa689b 100644 --- a/include/flash.h +++ b/include/flash.h @@ -7,10 +7,6 @@ #ifndef _FLASH_H_ #define _FLASH_H_ -#ifndef CONFIG_SYS_MAX_FLASH_SECT -#define CONFIG_SYS_MAX_FLASH_SECT 512 -#endif - /*----------------------------------------------------------------------- * FLASH Info: contains chip specific data, per FLASH bank */ @@ -91,6 +87,7 @@ int flash_sect_erase(ulong addr_first, ulong addr_last); int flash_sect_protect(int flag, ulong addr_first, ulong addr_last); int flash_sect_roundb(ulong *addr); unsigned long flash_sector_size(flash_info_t *info, flash_sect_t sect); +void flash_cmd_reset(flash_info_t *info); void flash_set_verbose(uint v); /* common/flash.c */ diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h index d4aeea7e464..1321da19102 100644 --- a/include/mtd/cfi_flash.h +++ b/include/mtd/cfi_flash.h @@ -176,7 +176,6 @@ extern int cfi_flash_num_flash_banks; phys_addr_t cfi_flash_bank_addr(int i); unsigned long cfi_flash_bank_size(int i); -void flash_cmd_reset(flash_info_t *info); #ifdef CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS void flash_write8(u8 value, void *addr); |