Move include and source files to logical locations

Move almost all system include files to a logical sub-directory
under ./include. The only remaining system include directories
not under ./include are specific to the platform. Move the
corresponding source files to match the include directory
structure.

Also remove pm.h as it is no longer used.

Change-Id: Ie5ea6368ec5fad459f3e8a802ad129135527f0b3

Makefile

@@ -132,14 +132,20 @@ endif
 .SUFFIXES:
 
 
-INCLUDES		+=	-Ilib/include/			\
-				-Idrivers/io			\
-				-Iinclude/${ARCH}/		\
-				-Iinclude/			\
-				-Iarch/system/gic		\
-				-Iservices/std_svc/psci		\
+INCLUDES		+=	-Iinclude/bl1			\
+				-Iinclude/bl2			\
+				-Iinclude/bl31			\
+				-Iinclude/bl31/services		\
+				-Iinclude/bl32			\
+				-Iinclude/bl32/payloads		\
+				-Iinclude/common		\
+				-Iinclude/drivers		\
+				-Iinclude/drivers/arm		\
+				-Iinclude/lib			\
+				-Iinclude/lib/aarch64		\
 				-Iinclude/stdlib		\
 				-Iinclude/stdlib/sys		\
+				-Iservices/std_svc/psci		\
 				-Iplat/${PLAT}			\
 				${PLAT_INCLUDES}		\
 				${SPD_INCLUDES}

bl1/bl1.mk

@@ -32,15 +32,12 @@ vpath			%.c	plat/${PLAT}		\
 				plat/${PLAT}/${ARCH}	\
 				common			\
 				lib			\
-				arch/${ARCH}		\
-				lib/arch/${ARCH}	\
+				lib/${ARCH}		\
 				${PLAT_BL1_C_VPATH}
 
-vpath			%.S	arch/${ARCH}/cpu	\
-				plat/common/${ARCH}	\
+vpath			%.S	plat/common/${ARCH}	\
 				plat/${PLAT}/${ARCH}	\
-				include			\
-				lib/arch/${ARCH}	\
+				lib/${ARCH}		\
 				${PLAT_BL1_S_VPATH}
 
 BL1_SOURCES		+=	bl1_arch_setup.c	\

bl2/bl2.mk

@@ -32,12 +32,10 @@ vpath			%.c	common				\
 				lib				\
 				plat/${PLAT}			\
 				plat/${PLAT}/${ARCH}		\
-				arch/${ARCH}			\
 				${PLAT_BL2_C_VPATH}
 
-vpath			%.S	lib/arch/${ARCH}		\
-				include				\
-				lib/sync/locks/exclusive	\
+vpath			%.S	lib/${ARCH}			\
+				lib/locks/exclusive		\
 				common/${ARCH}			\
 				${PLAT_BL2_S_VPATH}
 

bl31/bl31.mk

@@ -30,23 +30,21 @@
 
 vpath			%.c	common					\
 				lib					\
-				arch/system/gic				\
+				drivers/arm/gic				\
 				plat/${PLAT}				\
-				arch/${ARCH}				\
 				services/std_svc			\
 				services/std_svc/psci			\
-				lib/sync/locks/bakery			\
+				lib/locks/bakery			\
 				plat/${PLAT}/${ARCH}			\
 				${PLAT_BL31_C_VPATH}
 
-vpath			%.S	lib/arch/${ARCH}			\
+vpath			%.S	lib/${ARCH}				\
 				services/std_svc			\
 				services/std_svc/psci			\
-				include					\
 				plat/${PLAT}/${ARCH}			\
-				lib/sync/locks/exclusive		\
+				lib/locks/exclusive			\
 				plat/common/${ARCH}			\
-				arch/system/gic/${ARCH}			\
+				drivers/arm/gic/${ARCH}			\
 				common/${ARCH}				\
 				${PLAT_BL31_S_VPATH}
 

bl32/tsp/tsp.mk

@@ -32,11 +32,9 @@ vpath			%.c	common				\
 				lib				\
 				plat/${PLAT}			\
 				plat/${PLAT}/${ARCH}		\
-				arch/${ARCH}
 
-vpath			%.S	lib/arch/${ARCH}		\
-				include				\
-				lib/sync/locks/exclusive	\
+vpath			%.S	lib/${ARCH}			\
+				lib/locks/exclusive		\
 				common/${ARCH}
 
 BL32_SOURCES		+=	tsp_entrypoint.S		\

drivers/arm/interconnect/cci-400/cci400.c → drivers/arm/cci400/cci400.c

@@ -44,7 +44,8 @@ void cci_enable_coherency(unsigned long mpidr)
 		      DVM_EN_BIT | SNOOP_EN_BIT);
 
 	/* Wait for the dust to settle down */
-	while (mmio_read_32(CCI400_BASE + STATUS_REG) & CHANGE_PENDING_BIT);
+	while (mmio_read_32(CCI400_BASE + STATUS_REG) & CHANGE_PENDING_BIT)
+		;
 }
 
 void cci_disable_coherency(unsigned long mpidr)
@@ -54,6 +55,7 @@ void cci_disable_coherency(unsigned long mpidr)
 		      ~(DVM_EN_BIT | SNOOP_EN_BIT));
 
 	/* Wait for the dust to settle down */
-	while (mmio_read_32(CCI400_BASE + STATUS_REG) & CHANGE_PENDING_BIT);
+	while (mmio_read_32(CCI400_BASE + STATUS_REG) & CHANGE_PENDING_BIT)
+		;
 }