Move this uncommon header out of the common header.
Fix up some style problems in flash.h while we are here.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
arch/arm/mach-at91/arm926ejs/eflash.c | 1 + board/AndesTech/adp-ae3xx/adp-ae3xx.c | 1 + board/AndesTech/adp-ag101p/adp-ag101p.c | 1 + board/AndesTech/ax25-ae350/ax25-ae350.c | 1 + board/Arcturus/ucp1020/cmd_arc.c | 1 + board/atmel/at91sam9263ek/at91sam9263ek.c | 1 + board/buffalo/lsxl/lsxl.c | 1 + board/cobra5272/flash.c | 2 ++ board/freescale/common/fsl_validate.c | 1 + board/freescale/m5253demo/flash.c | 1 + board/freescale/mpc8568mds/bcsr.c | 1 + board/freescale/mpc8568mds/mpc8568mds.c | 1 + board/freescale/mpc8569mds/bcsr.c | 1 + board/freescale/mpc8569mds/mpc8569mds.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 1 + board/gdsys/mpc8308/hrcon.c | 1 + board/gdsys/mpc8308/strider.c | 1 + board/renesas/sh7752evb/sh7752evb.c | 1 + board/renesas/sh7753evb/sh7753evb.c | 1 + board/renesas/sh7757lcr/sh7757lcr.c | 1 + board/siemens/taurus/taurus.c | 1 + board/socrates/socrates.c | 1 + board/spear/x600/x600.c | 1 + cmd/armflash.c | 1 + cmd/cros_ec.c | 1 + cmd/flash.c | 1 + cmd/jffs2.c | 1 + cmd/mvebu/bubt.c | 1 + cmd/sf.c | 1 + common/board_r.c | 1 + common/flash.c | 1 + drivers/dfu/dfu_sf.c | 1 + drivers/fastboot/fb_command.c | 1 + drivers/fastboot/fb_mmc.c | 1 + drivers/fastboot/fb_nand.c | 1 + drivers/misc/cros_ec.c | 1 + drivers/mtd/cfi_flash.c | 1 + drivers/mtd/jedec_flash.c | 1 + drivers/mtd/spi/sf_dataflash.c | 1 + drivers/mtd/spi/sf_mtd.c | 1 + drivers/mtd/stm32_flash.c | 1 + env/sf.c | 2 ++ fs/cramfs/cramfs.c | 1 + fs/jffs2/jffs2_1pass.c | 1 + include/common.h | 1 - 45 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c index cfd6490d9d..c875bfd89b 100644 --- a/arch/arm/mach-at91/arm926ejs/eflash.c +++ b/arch/arm/mach-at91/arm926ejs/eflash.c @@ -43,6 +43,7 @@ * do a read-modify-write for partially programmed pages */ #include <common.h> +#include <flash.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/at91_common.h> diff --git a/board/AndesTech/adp-ae3xx/adp-ae3xx.c b/board/AndesTech/adp-ae3xx/adp-ae3xx.c index a04415deca..8eb40bf295 100644 --- a/board/AndesTech/adp-ae3xx/adp-ae3xx.c +++ b/board/AndesTech/adp-ae3xx/adp-ae3xx.c @@ -8,6 +8,7 @@ #include <init.h> #include <asm/mach-types.h> #include <common.h> +#include <flash.h> #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) #include <netdev.h> #endif diff --git a/board/AndesTech/adp-ag101p/adp-ag101p.c b/board/AndesTech/adp-ag101p/adp-ag101p.c index faf39b4ba6..d349b19648 100644 --- a/board/AndesTech/adp-ag101p/adp-ag101p.c +++ b/board/AndesTech/adp-ag101p/adp-ag101p.c @@ -6,6 +6,7 @@ */
#include <common.h> +#include <flash.h> #include <init.h> #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) #include <netdev.h> diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index f164073000..de546dab17 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -5,6 +5,7 @@ */
#include <common.h> +#include <flash.h> #include <init.h> #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) #include <netdev.h> diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c index b50de63c5e..2b4853f8f9 100644 --- a/board/Arcturus/ucp1020/cmd_arc.c +++ b/board/Arcturus/ucp1020/cmd_arc.c @@ -12,6 +12,7 @@ #include <cpu_func.h> #include <div64.h> #include <env.h> +#include <flash.h> #include <malloc.h> #include <spi_flash.h> #include <mmc.h> diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index b811d931c4..be132bc185 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -7,6 +7,7 @@
#include <common.h> #include <debug_uart.h> +#include <flash.h> #include <init.h> #include <net.h> #include <vsprintf.h> diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c index 95d3a5e1f5..aa641259ac 100644 --- a/board/buffalo/lsxl/lsxl.c +++ b/board/buffalo/lsxl/lsxl.c @@ -10,6 +10,7 @@ #include <common.h> #include <env.h> #include <env_internal.h> +#include <flash.h> #include <net.h> #include <malloc.h> #include <netdev.h> diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index e601ed8e72..5860cd0ac0 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -7,7 +7,9 @@ #include <common.h> #include <console.h> #include <cpu_func.h> +#include <flash.h> #include <irq_func.h> +#include <uuid.h>
#define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE #define FLASH_BANK_SIZE 0x200000 diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 2bf9d58746..6aa412a937 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -5,6 +5,7 @@
#include <common.h> #include <dm.h> +#include <flash.h> #include <fsl_validate.h> #include <fsl_secboot_err.h> #include <fsl_sfp.h> diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c index a5223ecee6..87368564af 100644 --- a/board/freescale/m5253demo/flash.c +++ b/board/freescale/m5253demo/flash.c @@ -8,6 +8,7 @@ */
#include <common.h> +#include <flash.h> #include <irq_func.h>
#include <asm/immap.h> diff --git a/board/freescale/mpc8568mds/bcsr.c b/board/freescale/mpc8568mds/bcsr.c index 28e2a9435c..b1e638af5a 100644 --- a/board/freescale/mpc8568mds/bcsr.c +++ b/board/freescale/mpc8568mds/bcsr.c @@ -4,6 +4,7 @@ */
#include <common.h> +#include <flash.h> #include <asm/io.h>
#include "bcsr.h" diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 5167f81be7..da97495664 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -6,6 +6,7 @@ */
#include <common.h> +#include <flash.h> #include <init.h> #include <pci.h> #include <asm/processor.h> diff --git a/board/freescale/mpc8569mds/bcsr.c b/board/freescale/mpc8569mds/bcsr.c index 57cea0af68..9ed00f6e5b 100644 --- a/board/freescale/mpc8569mds/bcsr.c +++ b/board/freescale/mpc8569mds/bcsr.c @@ -4,6 +4,7 @@ */
#include <common.h> +#include <flash.h> #include <asm/io.h>
#include "bcsr.h" diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index cf5d8a5244..18e0d87a48 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -7,6 +7,7 @@
#include <common.h> #include <console.h> +#include <flash.h> #include <hwconfig.h> #include <init.h> #include <pci.h> diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index 776afa43a6..89844ee69e 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -6,6 +6,7 @@ #include <common.h> #include <env.h> #include <env_internal.h> +#include <flash.h> #include <init.h> #include <led.h> #include <malloc.h> diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c index d1110157a2..8994c8c71b 100644 --- a/board/gdsys/mpc8308/hrcon.c +++ b/board/gdsys/mpc8308/hrcon.c @@ -6,6 +6,7 @@
#include <common.h> #include <env.h> +#include <flash.h> #include <hwconfig.h> #include <i2c.h> #include <init.h> diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c index 9ba9e4278a..a12e08685b 100644 --- a/board/gdsys/mpc8308/strider.c +++ b/board/gdsys/mpc8308/strider.c @@ -6,6 +6,7 @@
#include <common.h> #include <env.h> +#include <flash.h> #include <hwconfig.h> #include <i2c.h> #include <init.h> diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c index 203eecf3d6..135aaa5234 100644 --- a/board/renesas/sh7752evb/sh7752evb.c +++ b/board/renesas/sh7752evb/sh7752evb.c @@ -5,6 +5,7 @@
#include <common.h> #include <env.h> +#include <flash.h> #include <init.h> #include <malloc.h> #include <asm/processor.h> diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c index 0b118b2f65..fbfc49ee01 100644 --- a/board/renesas/sh7753evb/sh7753evb.c +++ b/board/renesas/sh7753evb/sh7753evb.c @@ -5,6 +5,7 @@
#include <common.h> #include <env.h> +#include <flash.h> #include <init.h> #include <malloc.h> #include <asm/processor.h> diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c index e8d1fdd03f..ed041b14ee 100644 --- a/board/renesas/sh7757lcr/sh7757lcr.c +++ b/board/renesas/sh7757lcr/sh7757lcr.c @@ -5,6 +5,7 @@
#include <common.h> #include <env.h> +#include <flash.h> #include <init.h> #include <malloc.h> #include <asm/processor.h> diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 0979df563a..9f9cdfa234 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -15,6 +15,7 @@ #include <common.h> #include <dm.h> #include <env.h> +#include <flash.h> #include <init.h> #include <asm/io.h> #include <asm/arch/at91sam9260_matrix.h> diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index bd214acc80..84644a85c7 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -14,6 +14,7 @@ #include <clock_legacy.h> #include <env.h> #include <pci.h> +#include <uuid.h> #include <asm/processor.h> #include <asm/immap_85xx.h> #include <ioports.h> diff --git a/board/spear/x600/x600.c b/board/spear/x600/x600.c index e1232edd14..7cff6eecf2 100644 --- a/board/spear/x600/x600.c +++ b/board/spear/x600/x600.c @@ -7,6 +7,7 @@ */
#include <common.h> +#include <flash.h> #include <init.h> #include <micrel.h> #include <nand.h> diff --git a/cmd/armflash.c b/cmd/armflash.c index 6872b0dde3..f82f3dd1a3 100644 --- a/cmd/armflash.c +++ b/cmd/armflash.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> #include <console.h> +#include <flash.h> #include <asm/io.h>
#define MAX_REGIONS 4 diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c index 9e2f1b06f3..c6bbed9c4a 100644 --- a/cmd/cros_ec.c +++ b/cmd/cros_ec.c @@ -10,6 +10,7 @@ #include <command.h> #include <cros_ec.h> #include <dm.h> +#include <flash.h> #include <dm/device-internal.h> #include <dm/uclass-internal.h>
diff --git a/cmd/flash.c b/cmd/flash.c index 230d8408a4..df97fe740d 100644 --- a/cmd/flash.c +++ b/cmd/flash.c @@ -9,6 +9,7 @@ */ #include <common.h> #include <command.h> +#include <uuid.h>
#if defined(CONFIG_CMD_MTDPARTS) #include <jffs2/jffs2.h> diff --git a/cmd/jffs2.c b/cmd/jffs2.c index da2580d85d..748a73e2af 100644 --- a/cmd/jffs2.c +++ b/cmd/jffs2.c @@ -73,6 +73,7 @@ #include <common.h> #include <command.h> #include <env.h> +#include <flash.h> #include <image.h> #include <malloc.h> #include <jffs2/jffs2.h> diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index ef53153c46..f0ee54d6d2 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> #include <env.h> +#include <flash.h> #include <image.h> #include <vsprintf.h> #include <errno.h> diff --git a/cmd/sf.c b/cmd/sf.c index e993b3e5ad..2b9c268ac4 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -8,6 +8,7 @@ #include <common.h> #include <div64.h> #include <dm.h> +#include <flash.h> #include <malloc.h> #include <mapmem.h> #include <spi.h> diff --git a/common/board_r.c b/common/board_r.c index d9015cd057..138d65b13b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -13,6 +13,7 @@ #include <api.h> #include <cpu_func.h> #include <exports.h> +#include <flash.h> #include <hang.h> #include <image.h> #include <irq_func.h> diff --git a/common/flash.c b/common/flash.c index 9601716c3a..4a28ac5d34 100644 --- a/common/flash.c +++ b/common/flash.c @@ -8,6 +8,7 @@
#include <common.h> #include <flash.h> +#include <uuid.h>
#include <mtd/cfi_flash.h>
diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index 0fdbfae434..318e43c179 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -4,6 +4,7 @@ */
#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 3c4acfecf6..49f6a61c37 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -10,6 +10,7 @@ #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 d7cf9f4aac..d3249a54f7 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -10,6 +10,7 @@ #include <fastboot.h> #include <fastboot-internal.h> #include <fb_mmc.h> +#include <flash.h> #include <image-sparse.h> #include <part.h> #include <mmc.h> diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c index 6756ea769f..b165468145 100644 --- a/drivers/fastboot/fb_nand.c +++ b/drivers/fastboot/fb_nand.c @@ -6,6 +6,7 @@
#include <config.h> #include <common.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 fa9984f6bd..c145b67931 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -18,6 +18,7 @@ #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/cfi_flash.c b/drivers/mtd/cfi_flash.c index 4ce183b6f3..036cf0b4a1 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -22,6 +22,7 @@ #include <env.h> #include <errno.h> #include <fdt_support.h> +#include <flash.h> #include <irq_func.h> #include <asm/processor.h> #include <asm/io.h> diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c index f59b2bc62f..ce921b461a 100644 --- a/drivers/mtd/jedec_flash.c +++ b/drivers/mtd/jedec_flash.c @@ -12,6 +12,7 @@ /*#define DEBUG*/
#include <common.h> +#include <flash.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/byteorder.h> diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c index 55fb4bd31a..b1a38048d3 100644 --- a/drivers/mtd/spi/sf_dataflash.c +++ b/drivers/mtd/spi/sf_dataflash.c @@ -10,6 +10,7 @@ #include <dm.h> #include <errno.h> #include <fdtdec.h> +#include <flash.h> #include <spi.h> #include <spi_flash.h> #include <div64.h> diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c index 68c36002be..987fac2501 100644 --- a/drivers/mtd/spi/sf_mtd.c +++ b/drivers/mtd/spi/sf_mtd.c @@ -4,6 +4,7 @@ */
#include <common.h> +#include <flash.h> #include <malloc.h> #include <linux/errno.h> #include <linux/mtd/mtd.h> diff --git a/drivers/mtd/stm32_flash.c b/drivers/mtd/stm32_flash.c index fd0d5506e8..95afa2d6bc 100644 --- a/drivers/mtd/stm32_flash.c +++ b/drivers/mtd/stm32_flash.c @@ -5,6 +5,7 @@ */
#include <common.h> +#include <flash.h> #include <asm/io.h> #include <asm/arch/stm32.h> #include "stm32_flash.h" diff --git a/env/sf.c b/env/sf.c index 64c57f2cdf..64fafdc7cf 100644 --- a/env/sf.c +++ b/env/sf.c @@ -12,11 +12,13 @@ #include <dm.h> #include <env.h> #include <env_internal.h> +#include <flash.h> #include <malloc.h> #include <spi.h> #include <spi_flash.h> #include <search.h> #include <errno.h> +#include <uuid.h> #include <dm/device-internal.h> #include <u-boot/crc.h>
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index 228f599d44..7ef48bbc06 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -25,6 +25,7 @@ */
#include <common.h> +#include <flash.h> #include <malloc.h> #include <asm/byteorder.h> #include <linux/stat.h> diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 5912cde838..f58ec0e9a0 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -113,6 +113,7 @@
#include <common.h> #include <config.h> +#include <flash.h> #include <malloc.h> #include <div64.h> #include <linux/compiler.h> diff --git a/include/common.h b/include/common.h index a8242cafc5..1705d85e8a 100644 --- a/include/common.h +++ b/include/common.h @@ -29,7 +29,6 @@ #include <stdio.h> #include <linux/kernel.h> #include <part.h> -#include <flash.h> #include <image.h> #include <log.h> #include <asm/u-boot.h> /* boot information for Linux kernel */