Browse Source

common: Drop flash.h from common header

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>
Simon Glass 4 years ago
parent
commit
b79fdc7697
45 changed files with 46 additions and 1 deletions
  1. 1 0
      arch/arm/mach-at91/arm926ejs/eflash.c
  2. 1 0
      board/AndesTech/adp-ae3xx/adp-ae3xx.c
  3. 1 0
      board/AndesTech/adp-ag101p/adp-ag101p.c
  4. 1 0
      board/AndesTech/ax25-ae350/ax25-ae350.c
  5. 1 0
      board/Arcturus/ucp1020/cmd_arc.c
  6. 1 0
      board/atmel/at91sam9263ek/at91sam9263ek.c
  7. 1 0
      board/buffalo/lsxl/lsxl.c
  8. 2 0
      board/cobra5272/flash.c
  9. 1 0
      board/freescale/common/fsl_validate.c
  10. 1 0
      board/freescale/m5253demo/flash.c
  11. 1 0
      board/freescale/mpc8568mds/bcsr.c
  12. 1 0
      board/freescale/mpc8568mds/mpc8568mds.c
  13. 1 0
      board/freescale/mpc8569mds/bcsr.c
  14. 1 0
      board/freescale/mpc8569mds/mpc8569mds.c
  15. 1 0
      board/gardena/smart-gateway-mt7688/board.c
  16. 1 0
      board/gdsys/mpc8308/hrcon.c
  17. 1 0
      board/gdsys/mpc8308/strider.c
  18. 1 0
      board/renesas/sh7752evb/sh7752evb.c
  19. 1 0
      board/renesas/sh7753evb/sh7753evb.c
  20. 1 0
      board/renesas/sh7757lcr/sh7757lcr.c
  21. 1 0
      board/siemens/taurus/taurus.c
  22. 1 0
      board/socrates/socrates.c
  23. 1 0
      board/spear/x600/x600.c
  24. 1 0
      cmd/armflash.c
  25. 1 0
      cmd/cros_ec.c
  26. 1 0
      cmd/flash.c
  27. 1 0
      cmd/jffs2.c
  28. 1 0
      cmd/mvebu/bubt.c
  29. 1 0
      cmd/sf.c
  30. 1 0
      common/board_r.c
  31. 1 0
      common/flash.c
  32. 1 0
      drivers/dfu/dfu_sf.c
  33. 1 0
      drivers/fastboot/fb_command.c
  34. 1 0
      drivers/fastboot/fb_mmc.c
  35. 1 0
      drivers/fastboot/fb_nand.c
  36. 1 0
      drivers/misc/cros_ec.c
  37. 1 0
      drivers/mtd/cfi_flash.c
  38. 1 0
      drivers/mtd/jedec_flash.c
  39. 1 0
      drivers/mtd/spi/sf_dataflash.c
  40. 1 0
      drivers/mtd/spi/sf_mtd.c
  41. 1 0
      drivers/mtd/stm32_flash.c
  42. 2 0
      env/sf.c
  43. 1 0
      fs/cramfs/cramfs.c
  44. 1 0
      fs/jffs2/jffs2_1pass.c
  45. 0 1
      include/common.h

+ 1 - 0
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>

+ 1 - 0
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

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 2 - 0
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

+ 1 - 0
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>

+ 1 - 0
board/freescale/m5253demo/flash.c

@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <flash.h>
 #include <irq_func.h>
 
 #include <asm/immap.h>

+ 1 - 0
board/freescale/mpc8568mds/bcsr.c

@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <flash.h>
 #include <asm/io.h>
 
 #include "bcsr.h"

+ 1 - 0
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>

+ 1 - 0
board/freescale/mpc8569mds/bcsr.c

@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <flash.h>
 #include <asm/io.h>
 
 #include "bcsr.h"

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
board/spear/x600/x600.c

@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <flash.h>
 #include <init.h>
 #include <micrel.h>
 #include <nand.h>

+ 1 - 0
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

+ 1 - 0
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>
 

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
common/flash.c

@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <flash.h>
+#include <uuid.h>
 
 #include <mtd/cfi_flash.h>
 

+ 1 - 0
drivers/dfu/dfu_sf.c

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

+ 1 - 0
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>
 

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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"

+ 2 - 0
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>
 

+ 1 - 0
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>

+ 1 - 0
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>

+ 0 - 1
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 */