Reorganize architecture-dependent header files

The architecture dependant header files in include/lib/${ARCH} and
include/common/${ARCH} have been moved to /include/arch/${ARCH}.

Change-Id: I96f30fdb80b191a51448ddf11b1d4a0624c03394
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

17 files changed, 1 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 1b48fe1e..6b5b0803 100644
--- a/Makefile
+++ b/Makefile
@@ -270,19 +270,18 @@ BL_COMMON_SOURCES	+=	lib/${ARCH}/armclang_printf.S
 endif
 
 INCLUDES		+=	-Iinclude				\
+				-Iinclude/arch/${ARCH}			\
 				-Iinclude/bl1				\
 				-Iinclude/bl2				\
 				-Iinclude/bl2u				\
 				-Iinclude/bl31				\
 				-Iinclude/common			\
-				-Iinclude/common/${ARCH}		\
 				-Iinclude/drivers			\
 				-Iinclude/drivers/arm			\
 				-Iinclude/drivers/auth			\
 				-Iinclude/drivers/io			\
 				-Iinclude/drivers/ti/uart		\
 				-Iinclude/lib				\
-				-Iinclude/lib/${ARCH}			\
 				-Iinclude/lib/cpus			\
 				-Iinclude/lib/cpus/${ARCH}		\
 				-Iinclude/lib/el3_runtime		\
diff --git a/include/lib/aarch32/arch.h b/include/arch/aarch32/arch.h
index 8260c549..8260c549 100644
--- a/include/lib/aarch32/arch.h
+++ b/include/arch/aarch32/arch.h
diff --git a/include/lib/aarch32/arch_helpers.h b/include/arch/aarch32/arch_helpers.h
index a6fe14fb..a6fe14fb 100644
--- a/include/lib/aarch32/arch_helpers.h
+++ b/include/arch/aarch32/arch_helpers.h
diff --git a/include/common/aarch32/asm_macros.S b/include/arch/aarch32/asm_macros.S
index c54f75c2..c54f75c2 100644
--- a/include/common/aarch32/asm_macros.S
+++ b/include/arch/aarch32/asm_macros.S
diff --git a/include/common/aarch32/assert_macros.S b/include/arch/aarch32/assert_macros.S
index ab3a2ebb..ab3a2ebb 100644
--- a/include/common/aarch32/assert_macros.S
+++ b/include/arch/aarch32/assert_macros.S
diff --git a/include/common/aarch32/console_macros.S b/include/arch/aarch32/console_macros.S
index ba6e7d05..ba6e7d05 100644
--- a/include/common/aarch32/console_macros.S
+++ b/include/arch/aarch32/console_macros.S
diff --git a/include/common/aarch32/el3_common_macros.S b/include/arch/aarch32/el3_common_macros.S
index 048f1610..048f1610 100644
--- a/include/common/aarch32/el3_common_macros.S
+++ b/include/arch/aarch32/el3_common_macros.S
diff --git a/include/lib/aarch32/smccc_helpers.h b/include/arch/aarch32/smccc_helpers.h
index 67952ec5..67952ec5 100644
--- a/include/lib/aarch32/smccc_helpers.h
+++ b/include/arch/aarch32/smccc_helpers.h
diff --git a/include/lib/aarch32/smccc_macros.S b/include/arch/aarch32/smccc_macros.S
index 1fe6c64d..1fe6c64d 100644
--- a/include/lib/aarch32/smccc_macros.S
+++ b/include/arch/aarch32/smccc_macros.S
diff --git a/include/lib/aarch64/arch.h b/include/arch/aarch64/arch.h
index 72a14dcf..72a14dcf 100644
--- a/include/lib/aarch64/arch.h
+++ b/include/arch/aarch64/arch.h
diff --git a/include/lib/aarch64/arch_helpers.h b/include/arch/aarch64/arch_helpers.h
index 7222b9dc..7222b9dc 100644
--- a/include/lib/aarch64/arch_helpers.h
+++ b/include/arch/aarch64/arch_helpers.h
diff --git a/include/common/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S
index dea30213..dea30213 100644
--- a/include/common/aarch64/asm_macros.S
+++ b/include/arch/aarch64/asm_macros.S
diff --git a/include/common/aarch64/assert_macros.S b/include/arch/aarch64/assert_macros.S
index 06371c42..06371c42 100644
--- a/include/common/aarch64/assert_macros.S
+++ b/include/arch/aarch64/assert_macros.S
diff --git a/include/common/aarch64/console_macros.S b/include/arch/aarch64/console_macros.S
index 5c88d4f2..5c88d4f2 100644
--- a/include/common/aarch64/console_macros.S
+++ b/include/arch/aarch64/console_macros.S
diff --git a/include/common/aarch64/el3_common_macros.S b/include/arch/aarch64/el3_common_macros.S
index 410aeab7..410aeab7 100644
--- a/include/common/aarch64/el3_common_macros.S
+++ b/include/arch/aarch64/el3_common_macros.S
diff --git a/include/lib/aarch64/setjmp.h b/include/arch/aarch64/setjmp.h
index bbfe1df4..bbfe1df4 100644
--- a/include/lib/aarch64/setjmp.h
+++ b/include/arch/aarch64/setjmp.h
diff --git a/include/lib/aarch64/smccc_helpers.h b/include/arch/aarch64/smccc_helpers.h
index efab18b0..efab18b0 100644
--- a/include/lib/aarch64/smccc_helpers.h
+++ b/include/arch/aarch64/smccc_helpers.h