change #include "flash.h" to <flash/flash.h>

Changes from the flat namespace to heirarchical one.  Instead of writing:

	#include "flash.h"

the following form should be used.

	#include <flash/flash.h>

The exception is from .c files in the same directory.

diff --git a/src/flash/nand.h b/src/flash/nand.h
index a30a65495e769aef0e505a0327dd4019e7de5757..d73aee14a9ef6086473f7a326e5bc31e4ebf65ec 100644 (file)
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -25,7 +25,7 @@
 #ifndef NAND_H
 #define NAND_H
 
 #ifndef NAND_H
 #define NAND_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct nand_device;
 
 
 struct nand_device;
 

diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index a8d76cebd616bd67a7223157f09424dcbaffc155..66969127b3d63c3cf5a4bd524670063abb1ce601 100644 (file)
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "flash.h"
+#include <flash/flash.h>

 #include <target/armv4_5.h>
 #include <helper/binarybuffer.h>
 #include <helper/time_support.h>
 #include <target/armv4_5.h>
 #include <helper/binarybuffer.h>
 #include <helper/time_support.h>

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 5f7e8d72fef687db93c29a0d69814b48cd961ec4..dd4f3471cc538f2ffbfa3638ebc4908336379ca3 100644 (file)
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -61,7 +61,7 @@
 #include <string.h>
 #include <stddef.h>
 #include <helper/types.h>
 #include <string.h>
 #include <stddef.h>
 #include <helper/types.h>

-#include "flash.h"
+#include <flash/flash.h>

 #include <helper/membuf.h>
 #include "at91sam3.h"
 #include <helper/time_support.h>
 #include <helper/membuf.h>
 #include "at91sam3.h"
 #include <helper/time_support.h>

diff --git a/src/flash/nor/at91sam7.h b/src/flash/nor/at91sam7.h
index 4510686909b245090ac6809ce5b99a2eeb82157f..8077879416358554dd0d664673333961a811e55e 100644 (file)
--- a/src/flash/nor/at91sam7.h
+++ b/src/flash/nor/at91sam7.h
@@ -23,7 +23,7 @@
 #ifndef AT91SAM7_H
 #define AT91SAM7_H
 
 #ifndef AT91SAM7_H
 #define AT91SAM7_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct at91sam7_flash_bank
 {
 
 struct at91sam7_flash_bank
 {

diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index 2bc44384a72a1a6a092f38787f7b1c4f96f18a9d..fbc92772bc4e120ec509bf40dfea2faaca773c54 100644 (file)
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -23,7 +23,7 @@
 
 #include "avrf.h"
 #include <target/avrt.h>
 
 #include "avrf.h"
 #include <target/avrt.h>

-#include "flash.h"
+#include <flash/flash.h>

 
 
 /* AVR_JTAG_Instructions */
 
 
 /* AVR_JTAG_Instructions */

diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h
index d55fd34ef5f2335a0f18615d6979c19954ec1603..565a2b6cf64878a27230fcba64ed2b8edf20024a 100644 (file)
--- a/src/flash/nor/cfi.h
+++ b/src/flash/nor/cfi.h
@@ -20,7 +20,7 @@
 #ifndef CFI_H
 #define CFI_H
 
 #ifndef CFI_H
 #define CFI_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */
 
 #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */

diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c
index 81223b688b32932b7b34e62d387038158c50a2f2..8f8f746ebefc25453dc845d6ac514a25282f765d 100644 (file)
--- a/src/flash/nor/ecos.c
+++ b/src/flash/nor/ecos.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "flash.h"
+#include <flash/flash.h>

 #include <target/embeddedice.h>
 #include <target/image.h>
 #include <target/algorithm.h>
 #include <target/embeddedice.h>
 #include <target/image.h>
 #include <target/algorithm.h>

diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c
index 124ca3e1fc0f5bc50b2cf3ea01f3c19a76660743..49a0f722bf54544463f8dce34ada9880e8133cd9 100644 (file)
--- a/src/flash/nor/faux.c
+++ b/src/flash/nor/faux.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include "flash.h"
+#include <flash/flash.h>

 #include <target/image.h>
 #include "../hello.h"
 
 #include <target/image.h>
 #include "../hello.h"
 

diff --git a/src/flash/nor/lpc2000.h b/src/flash/nor/lpc2000.h
index 08e278a355681981c449baea48a3cfd5e64fc00e..30be3048222e7bf9871e91705836ddd6bcfa96b9 100644 (file)
--- a/src/flash/nor/lpc2000.h
+++ b/src/flash/nor/lpc2000.h
@@ -23,7 +23,7 @@
 #ifndef LPC2000_H
 #define LPC2000_H
 
 #ifndef LPC2000_H
 #define LPC2000_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 typedef enum
 {
 
 typedef enum
 {

diff --git a/src/flash/nor/lpc288x.h b/src/flash/nor/lpc288x.h
index 5a71ee08a2bf111be0e727d658c4e0344d1f886d..06f634ab89f2e6a55d31c24292688dee97883d83 100644 (file)
--- a/src/flash/nor/lpc288x.h
+++ b/src/flash/nor/lpc288x.h
@@ -21,7 +21,7 @@
 #ifndef lpc288x_H
 #define lpc288x_H
 
 #ifndef lpc288x_H
 #define lpc288x_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct lpc288x_flash_bank
 {
 
 struct lpc288x_flash_bank
 {

diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index c1fefd70c375d3710a89ea4fb81a888b4af11432..dc466f8e2b1625cc8b06303b9df86d2eea46548b 100644 (file)
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -24,7 +24,7 @@
 
 
 #include <target/image.h>
 
 
 #include <target/image.h>

-#include "flash.h"
+#include <flash/flash.h>

 #include <helper/binarybuffer.h>
 #include <target/armv4_5.h>
 #include <target/algorithm.h>
 #include <helper/binarybuffer.h>
 #include <target/armv4_5.h>
 #include <target/algorithm.h>

diff --git a/src/flash/nor/non_cfi.h b/src/flash/nor/non_cfi.h
index 44c92db4314182407d18781ee8dd0a626bb3dc39..cc6004e82221ef3d326086a400c6e5d7f4bf95ba 100644 (file)
--- a/src/flash/nor/non_cfi.h
+++ b/src/flash/nor/non_cfi.h
@@ -20,7 +20,7 @@
 #ifndef NON_CFI_H
 #define NON_CFI_H
 
 #ifndef NON_CFI_H
 #define NON_CFI_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct non_cfi
 {
 
 struct non_cfi
 {

diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c
index 57d9efaaaa6f78f8e3bab54cd08ed410c751b8d5..6e3ad1c9a767282dd957e6e1051df444b51a2dc0 100644 (file)
--- a/src/flash/nor/ocl.c
+++ b/src/flash/nor/ocl.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "ocl.h"
 #endif
 
 #include "ocl.h"

-#include "flash.h"
+#include <flash/flash.h>

 #include <target/embeddedice.h>
 
 
 #include <target/embeddedice.h>
 
 

diff --git a/src/flash/nor/pic32mx.h b/src/flash/nor/pic32mx.h
index 92f40c2e5f3b96086c4955374a12a597ec957506..b33e8317482f18e1565e17b254a6f831b350642f 100644 (file)
--- a/src/flash/nor/pic32mx.h
+++ b/src/flash/nor/pic32mx.h
@@ -26,7 +26,7 @@
 #ifndef PIC32MX_H
 #define PIC32MX_H
 
 #ifndef PIC32MX_H
 #define PIC32MX_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct pic32mx_flash_bank
 {
 
 struct pic32mx_flash_bank
 {

diff --git a/src/flash/nor/stellaris.h b/src/flash/nor/stellaris.h
index 949a346de47222434e43e79256bcca8c3b2c162d..85b709cc69f9c91df3c6286563e02c66dd1864a9 100644 (file)
--- a/src/flash/nor/stellaris.h
+++ b/src/flash/nor/stellaris.h
@@ -20,7 +20,7 @@
 #ifndef STELLARIS_FLASH_H
 #define STELLARIS_FLASH_H
 
 #ifndef STELLARIS_FLASH_H
 #define STELLARIS_FLASH_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct stellaris_flash_bank
 {
 
 struct stellaris_flash_bank
 {

diff --git a/src/flash/nor/stm32x.h b/src/flash/nor/stm32x.h
index 6cd047e101df2582a6353ccca3d753bdece63eec..b6e00edc3752e4f58517b9cea55fe0e734462393 100644 (file)
--- a/src/flash/nor/stm32x.h
+++ b/src/flash/nor/stm32x.h
@@ -23,7 +23,7 @@
 #ifndef STM32X_H
 #define STM32X_H
 
 #ifndef STM32X_H
 #define STM32X_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct stm32x_options
 {
 
 struct stm32x_options
 {

diff --git a/src/flash/nor/str7x.h b/src/flash/nor/str7x.h
index 81af0f1e7b0aadfb6f7ae9183553ef3a243fc30b..4daafb7d13782d7786d9b9f74265aa05ca6232fc 100644 (file)
--- a/src/flash/nor/str7x.h
+++ b/src/flash/nor/str7x.h
@@ -23,7 +23,7 @@
 #ifndef STR7X_H
 #define STR7X_H
 
 #ifndef STR7X_H
 #define STR7X_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct str7x_flash_bank
 {
 
 struct str7x_flash_bank
 {

diff --git a/src/flash/nor/str9x.h b/src/flash/nor/str9x.h
index c9d5152f2b436040af3665ac6dee42f059e5d7a7..29adecfae794eb5543173057eee375662db12738 100644 (file)
--- a/src/flash/nor/str9x.h
+++ b/src/flash/nor/str9x.h
@@ -23,7 +23,7 @@
 #ifndef STR9X_H
 #define STR9X_H
 
 #ifndef STR9X_H
 #define STR9X_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct str9x_flash_bank
 {
 
 struct str9x_flash_bank
 {

diff --git a/src/flash/nor/str9xpec.h b/src/flash/nor/str9xpec.h
index 1d5ce94377bfdc32f7d70265e6c53a13b8785a0f..cb2ac7807bc10e682c131301bfa9959059065aba 100644 (file)
--- a/src/flash/nor/str9xpec.h
+++ b/src/flash/nor/str9xpec.h
@@ -23,7 +23,7 @@
 #ifndef STR9XPEC_H
 #define STR9XPEC_H
 
 #ifndef STR9XPEC_H
 #define STR9XPEC_H
 

-#include "flash.h"
+#include <flash/flash.h>

 #include <jtag/jtag.h>
 
 struct str9xpec_flash_controller
 #include <jtag/jtag.h>
 
 struct str9xpec_flash_controller

diff --git a/src/flash/nor/tms470.h b/src/flash/nor/tms470.h
index f275e510673f26c047f307cc9b68c318f0167242..b2fea1b1762b0ffb569982c9f8b40e13fae1de78 100644 (file)
--- a/src/flash/nor/tms470.h
+++ b/src/flash/nor/tms470.h
@@ -20,7 +20,7 @@
 #ifndef TMS470_DOT_H
 #define TMS470_DOT_H
 
 #ifndef TMS470_DOT_H
 #define TMS470_DOT_H
 

-#include "flash.h"
+#include <flash/flash.h>

 
 struct tms470_flash_bank
 {
 
 struct tms470_flash_bank
 {

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 91852338bc3554298a8f745fd2c3d8d31589c1bd..40380a899336ef8a3148df1eaf5a0994477f3336 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -31,7 +31,7 @@
 #include <target/target_request.h>
 #include <target/register.h>
 #include "server.h"
 #include <target/target_request.h>
 #include <target/register.h>
 #include "server.h"

-#include "flash.h"
+#include <flash/flash.h>

 #include "gdb_server.h"
 #include <target/image.h>
 #include <jtag/jtag.h>
 #include "gdb_server.h"
 #include <target/image.h>
 #include <jtag/jtag.h>