leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Audit <flash.h> inclusion

Browse Source 
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 <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-07-23 13:05:03 -04:00
parent 1d3ecdac7e
commit 17ead040d4
36 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
board/atmel/at91sam9263ek/at91sam9263ek.c
View File

@ -7,7 +7,6 @@
#include <common.h> #include <common.h>
#include <debug_uart.h> #include <debug_uart.h>
#include <flash.h>
#include <init.h> #include <init.h>
#include <net.h> #include <net.h>
#include <vsprintf.h> #include <vsprintf.h>
@ -140,7 +139,7 @@ static void at91sam9263ek_lcd_hw_init(void)
#include <version.h> #include <version.h>
#ifdef CONFIG_MTD_NOR_FLASH #ifdef CONFIG_MTD_NOR_FLASH
extern flash_info_t flash_info[]; #include <flash.h>
#endif #endif
void lcd_show_board_info(void) void lcd_show_board_info(void)

1
board/buffalo/lsxl/lsxl.c
View File

@ -12,7 +12,6 @@
#include <command.h> #include <command.h>
#include <env.h> #include <env.h>
#include <env_internal.h> #include <env_internal.h>
#include <flash.h>
#include <init.h> #include <init.h>
#include <net.h> #include <net.h>
#include <malloc.h> #include <malloc.h>

3
board/freescale/common/fsl_validate.c
View File

@ -6,7 +6,6 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <flash.h>
#include <fsl_validate.h> #include <fsl_validate.h>
#include <fsl_secboot_err.h> #include <fsl_secboot_err.h>
#include <fsl_sfp.h> #include <fsl_sfp.h>
@ -79,6 +78,8 @@ static u32 check_ie(struct fsl_secboot_img_priv *img)
* address * address
*/ */
#if defined(CONFIG_MPC85xx) #if defined(CONFIG_MPC85xx)
#include <flash.h>
int get_csf_base_addr(u32 *csf_addr, u32 *flash_base_addr) int get_csf_base_addr(u32 *csf_addr, u32 *flash_base_addr)
{ {
struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);

1
board/gardena/smart-gateway-mt7688/board.c
View File

@ -7,7 +7,6 @@
#include <command.h> #include <command.h>
#include <env.h> #include <env.h>
#include <env_internal.h> #include <env_internal.h>
#include <flash.h>
#include <init.h> #include <init.h>
#include <led.h> #include <led.h>
#include <log.h> #include <log.h>

1
board/logicpd/omap3som/omap3logic.c
View File

@ -15,7 +15,6 @@
#include <init.h> #include <init.h>
#include <net.h> #include <net.h>
#include <ns16550.h> #include <ns16550.h>
#include <flash.h>
#include <nand.h> #include <nand.h>
#include <i2c.h> #include <i2c.h>
#include <serial.h> #include <serial.h>

1
board/siemens/taurus/taurus.c
View File

@ -15,7 +15,6 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <env.h> #include <env.h>
#include <flash.h>
#include <init.h> #include <init.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <asm/io.h> #include <asm/io.h>

2
board/socrates/socrates.c
View File

@ -30,8 +30,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
extern flash_info_t flash_info[]; /* FLASH chips info */
void local_bus_init (void); void local_bus_init (void);
ulong flash_get_size (ulong base, int banknum); ulong flash_get_size (ulong base, int banknum);

2
board/toradex/common/tdx-cfg-block.c
View File

@ -14,7 +14,9 @@
#include <cli.h> #include <cli.h>
#include <console.h> #include <console.h>
#include <env.h> #include <env.h>
#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_NOR
#include <flash.h> #include <flash.h>
#endif
#include <malloc.h> #include <malloc.h>
#include <mmc.h> #include <mmc.h>
#include <nand.h> #include <nand.h>

1
cmd/bootm.c
View File

@ -31,7 +31,6 @@ static int image_info(unsigned long addr);
#if defined(CONFIG_CMD_IMLS) #if defined(CONFIG_CMD_IMLS)
#include <flash.h> #include <flash.h>
#include <mtd/cfi_flash.h> #include <mtd/cfi_flash.h>
extern flash_info_t flash_info[]; /* info for FLASH chips */
#endif #endif
#if defined(CONFIG_CMD_IMLS) || defined(CONFIG_CMD_IMLS_NAND) #if defined(CONFIG_CMD_IMLS) || defined(CONFIG_CMD_IMLS_NAND)

2
cmd/cramfs.c
View File

@ -33,11 +33,11 @@
# define DEBUGF(fmt, args...) # define DEBUGF(fmt, args...)
#endif #endif
#include <flash.h>
#ifndef CONFIG_MTD_NOR_FLASH #ifndef CONFIG_MTD_NOR_FLASH
# define OFFSET_ADJUSTMENT 0 # define OFFSET_ADJUSTMENT 0
#else #else
#include <flash.h>
# define OFFSET_ADJUSTMENT (flash_info[id.num].start[0]) # define OFFSET_ADJUSTMENT (flash_info[id.num].start[0])
#endif #endif

1
cmd/cros_ec.c
View File

@ -10,7 +10,6 @@
#include <command.h> #include <command.h>
#include <cros_ec.h> #include <cros_ec.h>
#include <dm.h> #include <dm.h>
#include <flash.h>
#include <log.h> #include <log.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
#include <dm/uclass-internal.h> #include <dm/uclass-internal.h>

1
cmd/flash.c
View File

@ -25,7 +25,6 @@ int find_dev_and_part(const char *id, struct mtd_device **dev,
#ifdef CONFIG_MTD_NOR_FLASH #ifdef CONFIG_MTD_NOR_FLASH
#include <flash.h> #include <flash.h>
#include <mtd/cfi_flash.h> #include <mtd/cfi_flash.h>
extern flash_info_t flash_info[]; /* info for FLASH chips */
/* /*
* The user interface starts numbering for Flash banks with 1 * The user interface starts numbering for Flash banks with 1

5
cmd/jffs2.c
View File

@ -73,7 +73,9 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <env.h> #include <env.h>
#if defined(CONFIG_CMD_FLASH)
#include <flash.h> #include <flash.h>
#endif
#include <image.h> #include <image.h>
#include <malloc.h> #include <malloc.h>
#include <jffs2/jffs2.h> #include <jffs2/jffs2.h>
@ -156,7 +158,6 @@ static int mtd_device_validate(u8 type, u8 num, u32 *size)
if (type == MTD_DEV_TYPE_NOR) { if (type == MTD_DEV_TYPE_NOR) {
#if defined(CONFIG_CMD_FLASH) #if defined(CONFIG_CMD_FLASH)
if (num < CONFIG_SYS_MAX_FLASH_BANKS) { if (num < CONFIG_SYS_MAX_FLASH_BANKS) {
extern flash_info_t flash_info[];
*size = flash_info[num].size; *size = flash_info[num].size;
return 0; return 0;
@ -260,8 +261,6 @@ static inline u32 get_part_sector_size_nand(struct mtdids *id)
static inline u32 get_part_sector_size_nor(struct mtdids *id, struct part_info *part) static inline u32 get_part_sector_size_nor(struct mtdids *id, struct part_info *part)
{ {
#if defined(CONFIG_CMD_FLASH) #if defined(CONFIG_CMD_FLASH)
extern flash_info_t flash_info[];
u32 end_phys, start_phys, sector_size = 0, size = 0; u32 end_phys, start_phys, sector_size = 0, size = 0;
int i; int i;
flash_info_t *flash; flash_info_t *flash;

2
cmd/load.c
View File

@ -14,7 +14,9 @@
#include <efi_loader.h> #include <efi_loader.h>
#include <env.h> #include <env.h>
#include <exports.h> #include <exports.h>
#ifdef CONFIG_MTD_NOR_FLASH
#include <flash.h> #include <flash.h>
#endif
#include <image.h> #include <image.h>
#include <lmb.h> #include <lmb.h>
#include <mapmem.h> #include <mapmem.h>

2
cmd/mem.c
View File

@ -16,7 +16,9 @@
#include <cli.h> #include <cli.h>
#include <command.h> #include <command.h>
#include <console.h> #include <console.h>
#ifdef CONFIG_MTD_NOR_FLASH
#include <flash.h> #include <flash.h>
#endif
#include <hash.h> #include <hash.h>
#include <log.h> #include <log.h>
#include <mapmem.h> #include <mapmem.h>

1
cmd/mvebu/bubt.c
View File

@ -8,7 +8,6 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <env.h> #include <env.h>
#include <flash.h>
#include <image.h> #include <image.h>
#include <net.h> #include <net.h>
#include <vsprintf.h> #include <vsprintf.h>

1
cmd/sf.c
View File

@ -9,7 +9,6 @@
#include <command.h> #include <command.h>
#include <div64.h> #include <div64.h>
#include <dm.h> #include <dm.h>
#include <flash.h>
#include <log.h> #include <log.h>
#include <malloc.h> #include <malloc.h>
#include <mapmem.h> #include <mapmem.h>

2
common/board_r.c
View File

@ -14,7 +14,9 @@
#include <bootstage.h> #include <bootstage.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <exports.h> #include <exports.h>
#ifdef CONFIG_MTD_NOR_FLASH
#include <flash.h> #include <flash.h>
#endif
#include <hang.h> #include <hang.h>
#include <image.h> #include <image.h>
#include <irq_func.h> #include <irq_func.h>

2
common/flash.c
View File

@ -13,8 +13,6 @@
#include <mtd/cfi_flash.h> #include <mtd/cfi_flash.h>
extern flash_info_t flash_info[]; /* info for FLASH chips */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Functions * Functions
*/ */

5
common/update.c
View File

@ -20,14 +20,12 @@
#include <command.h> #include <command.h>
#include <env.h> #include <env.h>
#include <flash.h>
#include <net.h> #include <net.h>
#include <net/tftp.h> #include <net/tftp.h>
#include <malloc.h> #include <malloc.h>
#include <mapmem.h> #include <mapmem.h>
#include <dfu.h> #include <dfu.h>
#include <errno.h> #include <errno.h>
#include <mtd/cfi_flash.h>
#if defined(CONFIG_DFU_TFTP) || defined(CONFIG_UPDATE_TFTP) #if defined(CONFIG_DFU_TFTP) || defined(CONFIG_UPDATE_TFTP)
/* env variable holding the location of the update file */ /* env variable holding the location of the update file */
@ -49,7 +47,8 @@
extern ulong tftp_timeout_ms; extern ulong tftp_timeout_ms;
extern int tftp_timeout_count_max; extern int tftp_timeout_count_max;
#ifdef CONFIG_MTD_NOR_FLASH #ifdef CONFIG_MTD_NOR_FLASH
extern flash_info_t flash_info[]; #include <flash.h>
#include <mtd/cfi_flash.h>
static uchar *saved_prot_info; static uchar *saved_prot_info;
#endif #endif
static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr) static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)

1
drivers/dfu/dfu_sf.c
View File

@ -4,7 +4,6 @@
*/ */
#include <common.h> #include <common.h>
#include <flash.h>
#include <malloc.h> #include <malloc.h>
#include <errno.h> #include <errno.h>
#include <div64.h> #include <div64.h>

1
drivers/fastboot/fb_command.c
View File

@ -10,7 +10,6 @@
#include <fastboot-internal.h> #include <fastboot-internal.h>
#include <fb_mmc.h> #include <fb_mmc.h>
#include <fb_nand.h> #include <fb_nand.h>
#include <flash.h>
#include <part.h> #include <part.h>
#include <stdlib.h> #include <stdlib.h>

1
drivers/fastboot/fb_mmc.c
View File

@ -10,7 +10,6 @@
#include <fastboot.h> #include <fastboot.h>
#include <fastboot-internal.h> #include <fastboot-internal.h>
#include <fb_mmc.h> #include <fb_mmc.h>
#include <flash.h>
#include <image-sparse.h> #include <image-sparse.h>
#include <image.h> #include <image.h>
#include <log.h> #include <log.h>

1
drivers/fastboot/fb_nand.c
View File

@ -7,7 +7,6 @@
#include <config.h> #include <config.h>
#include <common.h> #include <common.h>
#include <blk.h> #include <blk.h>
#include <flash.h>
#include <fastboot.h> #include <fastboot.h>
#include <image-sparse.h> #include <image-sparse.h>

1
drivers/misc/cros_ec.c
View File

@ -18,7 +18,6 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <dm.h> #include <dm.h>
#include <flash.h>
#include <i2c.h> #include <i2c.h>
#include <cros_ec.h> #include <cros_ec.h>
#include <fdtdec.h> #include <fdtdec.h>

1
drivers/mtd/spi/sf_dataflash.c
View File

@ -10,7 +10,6 @@
#include <dm.h> #include <dm.h>
#include <errno.h> #include <errno.h>
#include <fdtdec.h> #include <fdtdec.h>
#include <flash.h>
#include <log.h> #include <log.h>
#include <spi.h> #include <spi.h>
#include <spi_flash.h> #include <spi_flash.h>

1
drivers/mtd/spi/sf_mtd.c
View File

@ -4,7 +4,6 @@
*/ */
#include <common.h> #include <common.h>
#include <flash.h>
#include <malloc.h> #include <malloc.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>

1
drivers/mtd/spi/spi-nor-core.c
View File

@ -10,7 +10,6 @@
*/ */
#include <common.h> #include <common.h>
#include <flash.h>
#include <log.h> #include <log.h>
#include <watchdog.h> #include <watchdog.h>
#include <dm.h> #include <dm.h>

2
env/flash.c vendored
View File

@ -13,7 +13,6 @@
#include <command.h> #include <command.h>
#include <env.h> #include <env.h>
#include <env_internal.h> #include <env_internal.h>
#include <flash.h>
#include <log.h> #include <log.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <linux/stddef.h> #include <linux/stddef.h>
@ -26,6 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
# if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH) # if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
# include <flash.h>
# define CMD_SAVEENV # define CMD_SAVEENV
# elif defined(CONFIG_ENV_ADDR_REDUND) # elif defined(CONFIG_ENV_ADDR_REDUND)
# error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH # error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH

1
env/sf.c vendored
View File

@ -12,7 +12,6 @@
#include <dm.h> #include <dm.h>
#include <env.h> #include <env.h>
#include <env_internal.h> #include <env_internal.h>
#include <flash.h>
#include <malloc.h> #include <malloc.h>
#include <spi.h> #include <spi.h>
#include <spi_flash.h> #include <spi_flash.h>

3
fs/cramfs/cramfs.c
View File

@ -25,7 +25,6 @@
*/ */
#include <common.h> #include <common.h>
#include <flash.h>
#include <malloc.h> #include <malloc.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/stat.h> #include <linux/stat.h>
@ -43,7 +42,7 @@ struct cramfs_super super;
/* CPU address space offset calculation macro, struct part_info offset is /* 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. */ * device address space offset, so we need to shift it by a device start address. */
#if defined(CONFIG_MTD_NOR_FLASH) #if defined(CONFIG_MTD_NOR_FLASH)
extern flash_info_t flash_info[]; #include <flash.h>
#define PART_OFFSET(x) ((ulong)x->offset + \ #define PART_OFFSET(x) ((ulong)x->offset + \
flash_info[x->dev->id->num].start[0]) flash_info[x->dev->id->num].start[0])
#else #else

4
fs/jffs2/jffs2_1pass.c
View File

@ -113,7 +113,6 @@
#include <common.h> #include <common.h>
#include <config.h> #include <config.h>
#include <flash.h>
#include <malloc.h> #include <malloc.h>
#include <div64.h> #include <div64.h>
#include <linux/compiler.h> #include <linux/compiler.h>
@ -381,6 +380,8 @@ static void put_fl_mem_onenand(void *buf)
#if defined(CONFIG_CMD_FLASH) #if defined(CONFIG_CMD_FLASH)
#include <flash.h>
/* /*
* Support for jffs2 on top of NOR-flash * 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; u32 addr = off;
struct mtdids *id = current_part->dev->id; struct mtdids *id = current_part->dev->id;
extern flash_info_t flash_info[];
flash_info_t *flash = &flash_info[id->num]; flash_info_t *flash = &flash_info[id->num];
addr += flash->start[0]; addr += flash->start[0];

5
include/flash.h
View File

@ -7,10 +7,6 @@
#ifndef _FLASH_H_ #ifndef _FLASH_H_
#define _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 * 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_protect(int flag, ulong addr_first, ulong addr_last);
int flash_sect_roundb(ulong *addr); int flash_sect_roundb(ulong *addr);
unsigned long flash_sector_size(flash_info_t *info, flash_sect_t sect); 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); void flash_set_verbose(uint v);
/* common/flash.c */ /* common/flash.c */

1
include/mtd/cfi_flash.h
View File

@ -176,7 +176,6 @@ extern int cfi_flash_num_flash_banks;
phys_addr_t cfi_flash_bank_addr(int i); phys_addr_t cfi_flash_bank_addr(int i);
unsigned long cfi_flash_bank_size(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 #ifdef CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS
void flash_write8(u8 value, void *addr); void flash_write8(u8 value, void *addr);

2
net/nfs.c
View File

@ -28,7 +28,9 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#ifdef CONFIG_SYS_DIRECT_FLASH_NFS
#include <flash.h> #include <flash.h>
#endif
#include <image.h> #include <image.h>
#include <log.h> #include <log.h>
#include <net.h> #include <net.h>

4
post/drivers/flash.c
View File

@ -6,12 +6,12 @@
* Licensed under the GPL-2 or later. * Licensed under the GPL-2 or later.
*/ */
#if CONFIG_POST & CONFIG_SYS_POST_FLASH
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#include <post.h> #include <post.h>
#include <flash.h> #include <flash.h>
#if CONFIG_POST & CONFIG_SYS_POST_FLASH
/* /*
* This code will walk over the declared sectors erasing them, * This code will walk over the declared sectors erasing them,
@ -30,8 +30,6 @@
# error "invalid flash block start/end" # error "invalid flash block start/end"
#endif #endif
extern flash_info_t flash_info[];
static void *seed_src_data(void *ptr, ulong *old_len, ulong new_len) static void *seed_src_data(void *ptr, ulong *old_len, ulong new_len)
{ {
unsigned char *p; unsigned char *p;