cfi_flash: move include/cfi_flash.c next to driver

This file has no useful things for others than the driver,
so move it next to the driver and remove the corresponding
include from other files.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

19 files changed, 3 insertions, 24 deletions

diff --git a/board/at91sam9260ek/init.c b/board/at91sam9260ek/init.c
index d3325f2a..9fd75256 100644
--- a/board/at91sam9260ek/init.c
+++ b/board/at91sam9260ek/init.c
@@ -20,7 +20,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <fec.h>
diff --git a/board/at91sam9263ek/init.c b/board/at91sam9263ek/init.c
index e5d7c205..21803ca3 100644
--- a/board/at91sam9263ek/init.c
+++ b/board/at91sam9263ek/init.c
@@ -22,7 +22,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <asm/armlinux.h>
diff --git a/board/eco920/eco920.c b/board/eco920/eco920.c
index 53041ddd..8d00877c 100644
--- a/board/eco920/eco920.c
+++ b/board/eco920/eco920.c
@@ -30,7 +30,6 @@
 #include <asm/armlinux.h>
 #include <s1d13706fb.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 
 /*
diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.c b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
index 0908dca7..2b6db150 100644
--- a/board/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -23,7 +23,6 @@
 #include <common.h>
 #include <errno.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <mach/imx-regs.h>
diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c
index e6fa0f04..3b6a93b7 100644
--- a/board/freescale-mx35-3-stack/3stack.c
+++ b/board/freescale-mx35-3-stack/3stack.c
@@ -26,7 +26,6 @@
  */
 
 #include <common.h>
-#include <cfi_flash.h>
 #include <environment.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/board/imx21ads/imx21ads.c b/board/imx21ads/imx21ads.c
index ba67e462..88dcfb29 100644
--- a/board/imx21ads/imx21ads.c
+++ b/board/imx21ads/imx21ads.c
@@ -23,7 +23,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <mach/imx-regs.h>
diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c
index 5f43d1b4..3512ed36 100644
--- a/board/imx27ads/imx27ads.c
+++ b/board/imx27ads/imx27ads.c
@@ -20,7 +20,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <mach/imx-regs.h>
diff --git a/board/mmccpu/init.c b/board/mmccpu/init.c
index bac8ef38..e010a831 100644
--- a/board/mmccpu/init.c
+++ b/board/mmccpu/init.c
@@ -20,7 +20,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <fec.h>
diff --git a/board/netx/netx.c b/board/netx/netx.c
index f187820e..d6bfcca5 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -20,7 +20,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <mach/netx-regs.h>
diff --git a/board/pcm030/pcm030.c b/board/pcm030/pcm030.c
index 8dd4f77c..f3845adf 100644
--- a/board/pcm030/pcm030.c
+++ b/board/pcm030/pcm030.c
@@ -29,7 +29,6 @@
 
 #include <common.h>
 #include <driver.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <mach/mpc5xxx.h>
 #include <mach/fec.h>
diff --git a/board/pcm038/pcm038.c b/board/pcm038/pcm038.c
index 56f44b51..313b7df7 100644
--- a/board/pcm038/pcm038.c
+++ b/board/pcm038/pcm038.c
@@ -20,7 +20,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <mach/imx-regs.h>
diff --git a/board/phycard-i.MX27/pca100.c b/board/phycard-i.MX27/pca100.c
index d22b327b..2fb1e35a 100644
--- a/board/phycard-i.MX27/pca100.c
+++ b/board/phycard-i.MX27/pca100.c
@@ -20,7 +20,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <mach/imx-regs.h>
diff --git a/board/pm9263/init.c b/board/pm9263/init.c
index c6b4421f..88b91eaf 100644
--- a/board/pm9263/init.c
+++ b/board/pm9263/init.c
@@ -20,7 +20,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <fec.h>
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index 356c4b8b..e781393e 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -20,7 +20,6 @@
 
 #include <common.h>
 #include <net.h>
-#include <cfi_flash.h>
 #include <init.h>
 #include <environment.h>
 #include <asm/mach-types.h>
diff --git a/commands/flash.c b/commands/flash.c
index f92b6040..655d7865 100644
--- a/commands/flash.c
+++ b/commands/flash.c
@@ -30,7 +30,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <cfi_flash.h>
 #include <errno.h>
 #include <getopt.h>
 #include <fs.h>
diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c
index c8e07c4d..0f7a4839 100644
--- a/drivers/nor/cfi_flash.c
+++ b/drivers/nor/cfi_flash.c
@@ -40,9 +40,9 @@
 #include <clock.h>
 #include <init.h>
 #include <malloc.h>
-#include <cfi_flash.h>
 #include <asm/io.h>
 #include <errno.h>
+#include "cfi_flash.h"
 
 /*
  * This file implements a Common Flash Interface (CFI) driver for barebox.
diff --git a/include/cfi_flash.h b/drivers/nor/cfi_flash.h
index a888f164..a8fa8794 100644
--- a/include/cfi_flash.h
+++ b/drivers/nor/cfi_flash.h
@@ -650,11 +650,5 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of
 #define FLASH_ERASE_TIMEOUT	120000	/* timeout for erasing in ms		*/
 #define FLASH_WRITE_TIMEOUT	500	/* timeout for writes  in ms		*/
 
-struct cfi_platform_data {
-        flash_info_t finfo;
-};
-
-int flash_init (void);
-
 #endif /* __CFI_FLASH_H */
 
diff --git a/drivers/nor/cfi_flash_amd.c b/drivers/nor/cfi_flash_amd.c
index 403405e8..4f0ab572 100644
--- a/drivers/nor/cfi_flash_amd.c
+++ b/drivers/nor/cfi_flash_amd.c
@@ -1,6 +1,6 @@
 #include <common.h>
 #include <stdio.h>
-#include <cfi_flash.h>
+#include "cfi_flash.h"
 
 static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect)
 {
diff --git a/drivers/nor/cfi_flash_intel.c b/drivers/nor/cfi_flash_intel.c
index 98e0ee54..e4dfdfac 100644
--- a/drivers/nor/cfi_flash_intel.c
+++ b/drivers/nor/cfi_flash_intel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <cfi_flash.h>
+#include "cfi_flash.h"
 
 /*
  * read jedec ids from device and set corresponding fields in info struct