From ddea03304310e1342ee127fc7e6507bbfb237ae4 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Thu, 3 Dec 2009 04:14:42 -0800
Subject: [PATCH] change #include "armv4_5.h" to <target/armv4_5.h>

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

	#include "armv4_5.h"

the following form should be used.

	#include <target/armv4_5.h>

The exception is from .c files in the same directory.
---
 src/flash/arm_nandio.c     | 2 +-
 src/flash/nand/orion.c     | 2 +-
 src/flash/nor/aduc702x.c   | 2 +-
 src/flash/nor/cfi.c        | 2 +-
 src/flash/nor/lpc2900.c    | 2 +-
 src/flash/nor/str7x.c      | 2 +-
 src/target/arm11.h         | 2 +-
 src/target/arm7_9_common.h | 2 +-
 src/target/armv7a.h        | 2 +-
 src/target/armv7m.h        | 2 +-
 src/target/xscale.h        | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/flash/arm_nandio.c b/src/flash/arm_nandio.c
index 4647c7948..fdf2109bd 100644
--- a/src/flash/arm_nandio.c
+++ b/src/flash/arm_nandio.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "arm_nandio.h"
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include <target/algorithm.h>
 
 /**
diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c
index 77a03f275..0f08fe42b 100644
--- a/src/flash/nand/orion.c
+++ b/src/flash/nand/orion.c
@@ -27,7 +27,7 @@
 #endif
 
 #include "arm_nandio.h"
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 
 
 struct orion_nand_controller
diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index 402da1f48..a8d76cebd 100644
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "flash.h"
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include <helper/binarybuffer.h>
 #include <helper/time_support.h>
 #include <target/algorithm.h>
diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 043d74206..61b5d4cf9 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -25,7 +25,7 @@
 
 #include "cfi.h"
 #include "non_cfi.h"
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
 
diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index 9cbb9e4bd..cf746794f 100644
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -26,7 +26,7 @@
 #include "image.h"
 #include "flash.h"
 #include <helper/binarybuffer.h>
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include <target/algorithm.h>
 
 
diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index 4da3f07ee..c5a1c345c 100644
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "str7x.h"
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include <helper/binarybuffer.h>
 #include <target/algorithm.h>
 
diff --git a/src/target/arm11.h b/src/target/arm11.h
index fd1472076..b118e1c6c 100644
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -23,7 +23,7 @@
 #ifndef ARM11_H
 #define ARM11_H
 
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include <target/arm_dpm.h>
 
 #define ARM11_TAP_DEFAULT			TAP_INVALID
diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 9cf8b4179..7555bec21 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -29,7 +29,7 @@
 #ifndef ARM7_9_COMMON_H
 #define ARM7_9_COMMON_H
 
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include <target/arm_jtag.h>
 
 #define	ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */
diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 9158d787c..da8ccdf4e 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -20,7 +20,7 @@
 #define ARMV7A_H
 
 #include <target/arm_adi_v5.h>
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include "armv4_5_mmu.h"
 #include "armv4_5_cache.h"
 #include <target/arm_dpm.h>
diff --git a/src/target/armv7m.h b/src/target/armv7m.h
index 46871e1ea..353860a93 100644
--- a/src/target/armv7m.h
+++ b/src/target/armv7m.h
@@ -27,7 +27,7 @@
 #define ARMV7M_COMMON_H
 
 #include <target/arm_adi_v5.h>
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 
 /* define for enabling armv7 gdb workarounds */
 #if 1
diff --git a/src/target/xscale.h b/src/target/xscale.h
index 0a70ecb31..9e19f45a9 100644
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -23,7 +23,7 @@
 #ifndef XSCALE_H
 #define XSCALE_H
 
-#include "armv4_5.h"
+#include <target/armv4_5.h>
 #include "armv4_5_mmu.h"
 #include "trace.h"
 
-- 
2.11.4.GIT