summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/at91sam9260ek/init.c1
-rw-r--r--board/at91sam9263ek/init.c1
-rw-r--r--board/eco920/eco920.c1
-rw-r--r--board/eukrea_cpuimx27/eukrea_cpuimx27.c1
-rw-r--r--board/freescale-mx35-3-stack/3stack.c1
-rw-r--r--board/imx21ads/imx21ads.c1
-rw-r--r--board/imx27ads/imx27ads.c1
-rw-r--r--board/mmccpu/init.c1
-rw-r--r--board/netx/netx.c1
-rw-r--r--board/pcm030/pcm030.c1
-rw-r--r--board/pcm038/pcm038.c1
-rw-r--r--board/phycard-i.MX27/pca100.c1
-rw-r--r--board/pm9263/init.c1
-rw-r--r--board/scb9328/scb9328.c1
-rw-r--r--commands/flash.c1
-rw-r--r--drivers/nor/cfi_flash.c2
-rw-r--r--drivers/nor/cfi_flash.h (renamed from include/cfi_flash.h)6
-rw-r--r--drivers/nor/cfi_flash_amd.c2
-rw-r--r--drivers/nor/cfi_flash_intel.c2
19 files changed, 3 insertions, 24 deletions
diff --git a/board/at91sam9260ek/init.c b/board/at91sam9260ek/init.c
index d3325f2ae2..9fd75256c6 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 e5d7c205b4..21803ca3b5 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 53041ddd4c..8d00877ce6 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 0908dca7c8..2b6db15028 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 e6fa0f0472..3b6a93b75a 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 ba67e462ba..88dcfb296e 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 5f43d1b4f0..3512ed3685 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 bac8ef3854..e010a83104 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 f187820ecd..d6bfcca54d 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 8dd4f77c03..f3845adf4c 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 56f44b51eb..313b7df77b 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 d22b327bf2..2fb1e35ac7 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 c6b4421f44..88b91eafa9 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 356c4b8bcd..e781393eae 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 f92b60404f..655d7865a4 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 c8e07c4d6c..0f7a4839ac 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 a888f16447..a8fa8794fc 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 403405e8cc..4f0ab5722f 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 98e0ee54c7..e4dfdface9 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 13:17:51 +0000