remove target.h from flash.h

The flash.h header does not require the target.h header file, but
its implementation source files do.  Move it to flash/nor/imp.h.

diff --git a/src/flash/flash.h b/src/flash/flash.h
index 1e1be85ec2f1945ebae24c3c01296d9ca67b60b0..8cd50f68253cade7cd92c5afa336ebb2d9a963d6 100644 (file)
--- a/src/flash/flash.h
+++ b/src/flash/flash.h
@@ -27,7 +27,6 @@
 #define FLASH_H
 
 #include <flash/common.h>
-#include <target/target.h>
 
 struct image;
 

diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index 66969127b3d63c3cf5a4bd524670063abb1ce601..1b9f5c083571deca7fdeb187a3fd9cc73fffca90 100644 (file)
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -23,11 +23,11 @@
 #include "config.h"
 #endif
 
-#include <flash/flash.h>
-#include <target/armv4_5.h>
+#include "imp.h"
 #include <helper/binarybuffer.h>
 #include <helper/time_support.h>
 #include <target/algorithm.h>
+#include <target/armv4_5.h>
 
 
 static int aduc702x_build_sector_list(struct flash_bank *bank);

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index dd4f3471cc538f2ffbfa3638ebc4908336379ca3..1194e25f1a7e840c24ffaa4055144fa4f3b87dc1 100644 (file)
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -57,13 +57,9 @@
 #endif
 
 
-#include <stdio.h>
-#include <string.h>
-#include <stddef.h>
-#include <helper/types.h>
-#include <flash/flash.h>
-#include <helper/membuf.h>
+#include "imp.h"
 #include "at91sam3.h"
+#include <helper/membuf.h>
 #include <helper/time_support.h>
 
 #define REG_NAME_WIDTH  (12)

diff --git a/src/flash/nor/at91sam7.c b/src/flash/nor/at91sam7.c
index 3201737da9b0e86cce2d1d49a957c3b204f61d15..97d6b568b074d2c2e2a6046db6b6d24ae2c715cc 100644 (file)
--- a/src/flash/nor/at91sam7.c
+++ b/src/flash/nor/at91sam7.c
@@ -49,6 +49,7 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "at91sam7.h"
 #include <helper/binarybuffer.h>
 

diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index fbc92772bc4e120ec509bf40dfea2faaca773c54..6c2d17fe5d782241144f654acd410e71e3bb485b 100644 (file)
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -21,9 +21,9 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "avrf.h"
 #include <target/avrt.h>
-#include <flash/flash.h>
 
 
 /* AVR_JTAG_Instructions */

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 61b5d4cf913b2992089d99e32818043bcfc1d040..c00d65f170da5e50a62aae84d5c31253c4be5507 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -23,6 +23,7 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "cfi.h"
 #include "non_cfi.h"
 #include <target/armv4_5.h>

diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c
index 8f8f746ebefc25453dc845d6ac514a25282f765d..799015ef61ab917422656a60cb7b8246f72cf2f4 100644 (file)
--- a/src/flash/nor/ecos.c
+++ b/src/flash/nor/ecos.c
@@ -21,10 +21,10 @@
 #include "config.h"
 #endif
 
-#include <flash/flash.h>
+#include "imp.h"
 #include <target/embeddedice.h>
-#include <target/image.h>
 #include <target/algorithm.h>
+#include <target/image.h>
 
 
 #if 0

diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c
index c996522c58388050392c574de65fa965351f528d..948f305572a17e1b204bb98074b2989bfea591d8 100644 (file)
--- a/src/flash/nor/faux.c
+++ b/src/flash/nor/faux.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <flash/flash.h>
+#include "imp.h"
 #include <target/image.h>
 #include "hello.h"
 

diff --git a/src/flash/nor/imp.h b/src/flash/nor/imp.h
index ade7297a4ff7a7fb39c45dc494933534464ace72..84ef8715bb5fd2dcd2da6ed529d0715302bba187 100644 (file)
--- a/src/flash/nor/imp.h
+++ b/src/flash/nor/imp.h
@@ -21,6 +21,10 @@
 
 // this is an internal header
 #include "core.h"
+// common flash internals
+#include <flash/common.h>
+// almost all drivers will need this file
+#include <target/target.h>
 
 /**
  * Adds a new NOR bank to the global list of banks.

diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index 295e3e7f1434d475a1a98a5bfc66238b6a6377b6..d824c37abefc7443dfb5c0a835dbc3c0d5e96128 100644 (file)
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -25,10 +25,11 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "lpc2000.h"
-#include <target/armv7m.h>
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
+#include <target/armv7m.h>
 
 
 /* flash programming support for NXP LPC17xx and LPC2xxx devices

diff --git a/src/flash/nor/lpc288x.c b/src/flash/nor/lpc288x.c
index 252a8133f7069eced7f35e37c9e8dc10ed26a7a6..5cb36d07de64277f219e28dfb60ed90a7325912e 100644 (file)
--- a/src/flash/nor/lpc288x.c
+++ b/src/flash/nor/lpc288x.c
@@ -31,6 +31,7 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "lpc288x.h"
 #include <helper/binarybuffer.h>
 

diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index dc466f8e2b1625cc8b06303b9df86d2eea46548b..0b42d48c2fd02ca3bcbbd62d147d81d2b66bd061 100644 (file)
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -23,11 +23,11 @@
 #endif
 
 
-#include <target/image.h>
-#include <flash/flash.h>
+#include "imp.h"
 #include <helper/binarybuffer.h>
-#include <target/armv4_5.h>
 #include <target/algorithm.h>
+#include <target/armv4_5.h>
+#include <target/image.h>
 
 
 /* 1024 bytes */

diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c
index 6e3ad1c9a767282dd957e6e1051df444b51a2dc0..961537e088e004461219090344a4849d7afa34bf 100644 (file)
--- a/src/flash/nor/ocl.c
+++ b/src/flash/nor/ocl.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "ocl.h"
-#include <flash/flash.h>
 #include <target/embeddedice.h>
 
 

diff --git a/src/flash/nor/pic32mx.c b/src/flash/nor/pic32mx.c
index d2289b297ffabec997f5e9bf496526e7178fa585..7d98af31142d4adf6c493099a31ee9d6d318164c 100644 (file)
--- a/src/flash/nor/pic32mx.c
+++ b/src/flash/nor/pic32mx.c
@@ -27,6 +27,7 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "pic32mx.h"
 #include <target/mips32.h>
 

diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index f0028ea64b2ba3864118f20978438e0063554bf9..39885429872b1363c88c46a968e712f6d94b7d91 100644 (file)
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -28,10 +28,11 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "stellaris.h"
-#include <target/armv7m.h>
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
+#include <target/armv7m.h>
 
 
 #define DID0_VER(did0) ((did0 >> 28)&0x07)

diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c
index 37925470f6ffda5afa72763070f55124e1c3cbe5..9e761f91ca15f1f2108a9bf52409608b02c85ea6 100644 (file)
--- a/src/flash/nor/stm32x.c
+++ b/src/flash/nor/stm32x.c
@@ -24,10 +24,11 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "stm32x.h"
-#include <target/armv7m.h>
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
+#include <target/armv7m.h>
 
 
 static int stm32x_mass_erase(struct flash_bank *bank);

diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index c5a1c345c81f411c7480f4b64b4e99effae4939a..4f93ec9a84698052ac36a4a18c7e7bc7c8a4c99a 100644 (file)
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "str7x.h"
 #include <target/armv4_5.h>
 #include <helper/binarybuffer.h>

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index 045ab20bbe1732c4bdd2c3d5da7c4046e8fb295c..36096ff5312f9ff2860abf89d7e74aa9c1f1907f 100644 (file)
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -27,6 +27,7 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "str9x.h"
 #include <target/arm966e.h>
 #include <target/algorithm.h>

diff --git a/src/flash/nor/str9xpec.c b/src/flash/nor/str9xpec.c
index 87a4b062520f1de8b85407eff73ace3d4710a06a..734f2d1524ebb9d5f24dd47eb2faf39b1d48f3d2 100644 (file)
--- a/src/flash/nor/str9xpec.c
+++ b/src/flash/nor/str9xpec.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "str9xpec.h"
 #include <target/arm7_9_common.h>
 

diff --git a/src/flash/nor/tms470.c b/src/flash/nor/tms470.c
index 59659346971096e10bab562c91dd9b74002293c6..7efcbd4b918620217fb9341f30715064aba052d4 100644 (file)
--- a/src/flash/nor/tms470.c
+++ b/src/flash/nor/tms470.c
@@ -22,6 +22,7 @@
 #endif
 
 #include "tms470.h"
+#include "imp.h"
 
 
 /* ----------------------------------------------------------------------

diff --git a/src/server/gdb_server.h b/src/server/gdb_server.h
index 041497510cd15b8ec865a13c807d29d8d0d47c1c..05666a59bb6bff343b329c763d7c749a6d96de0b 100644 (file)
--- a/src/server/gdb_server.h
+++ b/src/server/gdb_server.h
@@ -27,6 +27,7 @@
 #define GDB_SERVER_H
 
 struct image;
+#include <target/target.h>
 
 #define GDB_BUFFER_SIZE        16384