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 <trini@konsulko.com>

diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index c3e1734dda0cbfeaac34efc0baec8fa6b8d6b200..86b4050c4c1712351ae4df29aa3643a9c7e1f31d 100644 (file)
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -7,7 +7,6 @@
 
 #include <common.h>
 #include <debug_uart.h>
-#include <flash.h>
 #include <init.h>
 #include <net.h>
 #include <vsprintf.h>
@@ -140,7 +139,7 @@ static void at91sam9263ek_lcd_hw_init(void)
 #include <version.h>
 
 #ifdef CONFIG_MTD_NOR_FLASH
-extern flash_info_t flash_info[];
+#include <flash.h>
 #endif
 
 void lcd_show_board_info(void)

diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 738b6bc25cea5b4a1b4c88aaa11c6fe125cf7f81..31d532b75294a56c1fa1afb001ebac3cb3b33839 100644 (file)
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -12,7 +12,6 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
-#include <flash.h>
 #include <init.h>
 #include <net.h>
 #include <malloc.h>

diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c
index f1a0b0cfc34ca25e735248c5a88c976afc58a048..f56e4e857af1d18351eaa41b71d1793bfe6d2d4a 100644 (file)
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <dm.h>
-#include <flash.h>
 #include <fsl_validate.h>
 #include <fsl_secboot_err.h>
 #include <fsl_sfp.h>
@@ -79,6 +78,8 @@ static u32 check_ie(struct fsl_secboot_img_priv *img)
  * address
  */
 #if defined(CONFIG_MPC85xx)
+#include <flash.h>
+
 int get_csf_base_addr(u32 *csf_addr, u32 *flash_base_addr)
 {
        struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);

diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index aa833a030fd96095eba2eabb58b7161c4346330f..0cfde91c94c62f153322c4696c436d891ac7454c 100644 (file)
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -7,7 +7,6 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
-#include <flash.h>
 #include <init.h>
 #include <led.h>
 #include <log.h>

diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c
index 2379b521904a84b55f1204ef52d20fe58b6f6135..559192e9001eb94e47b1c4284dc9a0a4a9e06e6f 100644 (file)
--- a/board/logicpd/omap3som/omap3logic.c
+++ b/board/logicpd/omap3som/omap3logic.c
@@ -15,7 +15,6 @@
 #include <init.h>
 #include <net.h>
 #include <ns16550.h>
-#include <flash.h>
 #include <nand.h>
 #include <i2c.h>
 #include <serial.h>

diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index dae064d4654af388db09fa11276abfd03be98964..6c44afb44875063a490ff4a2a96bf9034e74c3d4 100644 (file)
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -15,7 +15,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <flash.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/io.h>

diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 27aad4eaae3a6643ad76e1b19c2a29dd7fc4698b..f9e1bc6316489219f258a20f59b2be9b7f8b0810 100644 (file)
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -30,8 +30,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern flash_info_t flash_info[];      /* FLASH chips info */
-
 void local_bus_init (void);
 ulong flash_get_size (ulong base, int banknum);
 

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 7cf2dfae9746e06c8093d5fbc89089f8e3c34712..22c67c6e3887bdab4a51399a751464af4435fc12 100644 (file)
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -14,7 +14,9 @@
 #include <cli.h>
 #include <console.h>
 #include <env.h>
+#ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_NOR
 #include <flash.h>
+#endif
 #include <malloc.h>
 #include <mmc.h>
 #include <nand.h>

diff --git a/cmd/bootm.c b/cmd/bootm.c
index 1f70ee9e911bb6f4987791d0e7f1f9e1033cc5a3..9fe8ce4a27cfca493874d3639ceacb619361d713 100644 (file)
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -31,7 +31,6 @@ static int image_info(unsigned long addr);
 #if defined(CONFIG_CMD_IMLS)
 #include <flash.h>
 #include <mtd/cfi_flash.h>
-extern flash_info_t flash_info[]; /* info for FLASH chips */
 #endif
 
 #if defined(CONFIG_CMD_IMLS) || defined(CONFIG_CMD_IMLS_NAND)

diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 2aad50c6724cce48fd335dd2251265ad53ddc43b..57e2afa2472bed29a1b786418b829dcaae0cbdce 100644 (file)
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -33,11 +33,11 @@
 # define DEBUGF(fmt, args...)
 #endif
 
-#include <flash.h>
 
 #ifndef CONFIG_MTD_NOR_FLASH
 # define OFFSET_ADJUSTMENT     0
 #else
+#include <flash.h>
 # define OFFSET_ADJUSTMENT     (flash_info[id.num].start[0])
 #endif
 

diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index ad49905d67bb176e59c667c0379a07258f1fd929..90921cecf602f93637e02ba2eb75c0c0b3f9d573 100644 (file)
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -10,7 +10,6 @@
 #include <command.h>
 #include <cros_ec.h>
 #include <dm.h>
-#include <flash.h>
 #include <log.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>

diff --git a/cmd/flash.c b/cmd/flash.c
index db4bb2529c6a60df3829811cbd2e8129af4c0d42..f4f85ecc7a8e0613c63e55406098a60726b879ef 100644 (file)
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -25,7 +25,6 @@ int find_dev_and_part(const char *id, struct mtd_device **dev,
 #ifdef CONFIG_MTD_NOR_FLASH
 #include <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

diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 914a7beeed95fa3e7151520a36eda1bd3ea0c1a2..e00fcc2022665024c7399d97224da15861566bc8 100644 (file)
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -73,7 +73,9 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#if defined(CONFIG_CMD_FLASH)
 #include <flash.h>
+#endif
 #include <image.h>
 #include <malloc.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 defined(CONFIG_CMD_FLASH)
                if (num < CONFIG_SYS_MAX_FLASH_BANKS) {
-                       extern flash_info_t flash_info[];
                        *size = flash_info[num].size;
 
                        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)
 {
 #if defined(CONFIG_CMD_FLASH)
-       extern flash_info_t flash_info[];
-
        u32 end_phys, start_phys, sector_size = 0, size = 0;
        int i;
        flash_info_t *flash;

diff --git a/cmd/load.c b/cmd/load.c
index 1224a7f85bb37b52126aed10098cb9adec87e920..e44ae0d56b750c4311ff006fbcf8cd864ac77edc 100644 (file)
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -14,7 +14,9 @@
 #include <efi_loader.h>
 #include <env.h>
 #include <exports.h>
+#ifdef CONFIG_MTD_NOR_FLASH
 #include <flash.h>
+#endif
 #include <image.h>
 #include <lmb.h>
 #include <mapmem.h>

diff --git a/cmd/mem.c b/cmd/mem.c
index b7511382d3ac91327ff23871415945f9f9529a8e..1f4e3fcdede19c6723bc1e58337bd6494b9413c6 100644 (file)
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -16,7 +16,9 @@
 #include <cli.h>
 #include <command.h>
 #include <console.h>
+#ifdef CONFIG_MTD_NOR_FLASH
 #include <flash.h>
+#endif
 #include <hash.h>
 #include <log.h>
 #include <mapmem.h>

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index ffa05bc20181331794a64f1fd59c96dee2fc9726..2136af64163c0fa13c491d620bdaf2804dd29c24 100644 (file)
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -8,7 +8,6 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
-#include <flash.h>
 #include <image.h>
 #include <net.h>
 #include <vsprintf.h>

diff --git a/cmd/sf.c b/cmd/sf.c
index cd50b38081c2e5959dad9fae5d7caeaf73ff3830..058635cb2f83cba90de9f37f1fd02b6c3434fefb 100644 (file)
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -9,7 +9,6 @@
 #include <command.h>
 #include <div64.h>
 #include <dm.h>
-#include <flash.h>
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>

diff --git a/common/board_r.c b/common/board_r.c
index ed29069d2de6d2638e855e5908700c7a84dd8408..e702f0234ee7d7cd3caaeb95d53c952fa4e50193 100644 (file)
--- 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 f939c2f9e9545250e18e11f23509a95db162b98b..848f44e59dfdb349dec436e1f1176b5303633814 100644 (file)
--- 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 b9ad475d9d44b5753ab01b9fdb8efc5620d79739..80f16af6535817ebb018a9754e4548881e9305fc 100644 (file)
--- 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)

diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c
index 25a9c8185037d6888ec20a98a34f88cd75188d44..2dae159370644c7b8f04468e0f6e460844029c9e 100644 (file)
--- a/drivers/dfu/dfu_sf.c
+++ b/drivers/dfu/dfu_sf.c
@@ -4,7 +4,6 @@
  */
 
 #include <common.h>
-#include <flash.h>
 #include <malloc.h>
 #include <errno.h>
 #include <div64.h>

diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c
index 98eccc34556b3ad510b0a15c1c798ea5d73af663..bdfdf262c8a33b097fade98f9801f1cf72834dd2 100644 (file)
--- a/drivers/fastboot/fb_command.c
+++ b/drivers/fastboot/fb_command.c
@@ -10,7 +10,6 @@
 #include <fastboot-internal.h>
 #include <fb_mmc.h>
 #include <fb_nand.h>
-#include <flash.h>
 #include <part.h>
 #include <stdlib.h>
 

diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index c62e414306c3cd981f03e94b6380b63fe0d41fdb..033c510bc0961ded09c37fcd93e013566e1d8256 100644 (file)
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -10,7 +10,6 @@
 #include <fastboot.h>
 #include <fastboot-internal.h>
 #include <fb_mmc.h>
-#include <flash.h>
 #include <image-sparse.h>
 #include <image.h>
 #include <log.h>

diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index eb8a36f29222cc2afbcc8c7124ea904f8d8f5dff..6d3a900c772884e00af166ebcfedb8d829772a99 100644 (file)
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -7,7 +7,6 @@
 #include <config.h>
 #include <common.h>
 #include <blk.h>
-#include <flash.h>
 
 #include <fastboot.h>
 #include <image-sparse.h>

diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index e131eccd281f0bc0f0a45ee471eaba9e06e8f005..621d1752176a9175c75a78ddba18680cbc305965 100644 (file)
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -18,7 +18,6 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
-#include <flash.h>
 #include <i2c.h>
 #include <cros_ec.h>
 #include <fdtdec.h>

diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c
index 85867817c7861961e517c67cbaa6fbf892c4828d..e19e34244d1fc23ea55c870b6720921f8c52e6ac 100644 (file)
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@@ -10,7 +10,6 @@
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
-#include <flash.h>
 #include <log.h>
 #include <spi.h>
 #include <spi_flash.h>

diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c
index 0aed28a52b78acff7ad31f430285759fd0305bb3..071b25ac67f2d4e14f8ea3cf846716cbe926df85 100644 (file)
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@@ -4,7 +4,6 @@
  */
 
 #include <common.h>
-#include <flash.h>
 #include <malloc.h>
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 8a226a7af553c4f63f1a26367cb8ad12dfa702d4..26a356baf8418b7a5e08f9ca49688f89c3d11389 100644 (file)
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -10,7 +10,6 @@
  */
 
 #include <common.h>
-#include <flash.h>
 #include <log.h>
 #include <watchdog.h>
 #include <dm.h>

diff --git a/env/flash.c b/env/flash.c
index 9c8abfa016c401ceb37804920f9d7f175aa3ca17..1e75f8c004ee79d0bbac218c0a6284f0a6b89c85 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -13,7 +13,6 @@
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
-#include <flash.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/stddef.h>
@@ -26,6 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifndef CONFIG_SPL_BUILD
 # if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_FLASH)
+#  include <flash.h>
 #  define CMD_SAVEENV
 # elif defined(CONFIG_ENV_ADDR_REDUND)
 #  error CONFIG_ENV_ADDR_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_FLASH

diff --git a/env/sf.c b/env/sf.c
index 4b768542c14c0a7787c1528702a3838bd9bd43ec..a425ecc11c8e6c27606e7f684b6dd641f4abb934 100644 (file)
--- a/env/sf.c
+++ b/env/sf.c
@@ -12,7 +12,6 @@
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>
-#include <flash.h>
 #include <malloc.h>
 #include <spi.h>
 #include <spi_flash.h>

diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index 7ef48bbc064c46a87fbb6156843de518e53e61ce..6c017cebc50ff1338c1acb80264618fbd00872a2 100644 (file)
--- 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 1818e8121569f384d97e83e3b959d84ddfa23c97..ef7b302725cad76fde3c81d2967eadfdc32cea78 100644 (file)
--- 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];

diff --git a/include/flash.h b/include/flash.h
index f3959f5012021a2033f0696442d9e5eb4089fa86..95992fa689bbc7c8cbb2fbe34e7cbdac958a77f4 100644 (file)
--- 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 d4aeea7e464b05a0d8c5fec91e967738fb8eb112..1321da191028f6245d1562595873f241c63aae78 100644 (file)
--- 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);

diff --git a/net/nfs.c b/net/nfs.c
index 9152ab742ef1a327254547d8ae125588b736b105..9f65cfb20dc9eb0d7447e041cfcb1e9afc0c9e53 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -28,7 +28,9 @@
 
 #include <common.h>
 #include <command.h>
+#ifdef CONFIG_SYS_DIRECT_FLASH_NFS
 #include <flash.h>
+#endif
 #include <image.h>
 #include <log.h>
 #include <net.h>

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