Build system: minor spacing tidyup

Tidy up the spacing of variable definitions within the makefiles to make
them more consistent, easier to read and amend.

Change-Id: Ic6d7c8489ca4330824abb5cd1ead8f1d449d1a85
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

Makefile

@@ -50,8 +50,13 @@ else
 	BUILD_TYPE	:=	release
 endif
 
-BL_COMMON_OBJS		:=	misc_helpers.o cache_helpers.o tlb_helpers.o		\
+BL_COMMON_OBJS		:=	misc_helpers.o		\
-				std.o bl_common.o platform_helpers.o
+				cache_helpers.o		\
+				tlb_helpers.o		\
+				std.o			\
+				bl_common.o		\
+				platform_helpers.o
+
 ARCH 			?=	aarch64
 
 # By default, build all platforms available
@@ -109,10 +114,15 @@ BL1_LINKERFILE		:= 	$(addprefix ${BUILD_BL1}/,${BL1_LINKERFILE})
 BL2_LINKERFILE		:= 	$(addprefix ${BUILD_BL2}/,${BL2_LINKERFILE})
 BL31_LINKERFILE		:= 	$(addprefix ${BUILD_BL31}/,${BL31_LINKERFILE})
 
-INCLUDES		+=	-Ilib/include/ -Iinclude/${ARCH}/ -Iinclude/	\
+INCLUDES		+=	-Ilib/include/			\
-				-Iarch/system/gic -Icommon/psci			\
+				-Iinclude/${ARCH}/		\
-				-Iinclude/stdlib -Iinclude/stdlib/sys		\
+				-Iinclude/			\
-				-Iplat/${PLAT} ${PLAT_INCLUDES}
+				-Iarch/system/gic		\
+				-Icommon/psci			\
+				-Iinclude/stdlib		\
+				-Iinclude/stdlib/sys		\
+				-Iplat/${PLAT}			\
+				${PLAT_INCLUDES}
 
 ASFLAGS			+= 	-nostdinc -ffreestanding -Wa,--fatal-warnings	\
 				-mgeneral-regs-only -D__ASSEMBLY__ ${INCLUDES}

bl1/bl1.mk

@@ -28,13 +28,18 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-vpath			%.c	plat/${PLAT} plat/${PLAT}/${ARCH}	\
+vpath			%.c	plat/${PLAT}		\
-				common/ lib/ arch/${ARCH}		\
+				plat/${PLAT}/${ARCH}	\
+				common			\
+				lib			\
+				arch/${ARCH}		\
 				${PLAT_BL1_C_VPATH}
 
-vpath			%.S	arch/${ARCH}/cpu plat/common/${ARCH}	\
+vpath			%.S	arch/${ARCH}/cpu	\
+				plat/common/${ARCH}	\
 				plat/${PLAT}/${ARCH}	\
-				include/ lib/arch/${ARCH}		\
+				include			\
+				lib/arch/${ARCH}	\
 				${PLAT_BL1_S_VPATH}
 
 BL1_OBJS		+=	bl1_arch_setup.o	\

bl2/bl2.mk

@@ -28,12 +28,16 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-vpath			%.c	common/ lib/ 		\
+vpath			%.c	common				\
-				plat/${PLAT} plat/${PLAT}/${ARCH} arch/${ARCH}	\
+				lib				\
+				plat/${PLAT}			\
+				plat/${PLAT}/${ARCH}		\
+				arch/${ARCH}			\
 				${PLAT_BL2_C_VPATH}
 
 vpath			%.S	lib/arch/${ARCH}		\
-				include lib/sync/locks/exclusive	\
+				include				\
+				lib/sync/locks/exclusive	\
 				${PLAT_BL2_S_VPATH}
 
 BL2_OBJS		+=	bl2_entrypoint.o		\

bl31/bl31.mk

@@ -28,14 +28,22 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-vpath			%.c	common/ lib/ arch/system/gic			\
+vpath			%.c	common					\
-				plat/${PLAT} arch/${ARCH} common/psci		\
+				lib					\
-				lib/sync/locks/bakery/				\
+				arch/system/gic				\
-				plat/${PLAT}/${ARCH} ${PLAT_BL31_C_VPATH}
+				plat/${PLAT}				\
+				arch/${ARCH}				\
+				common/psci				\
+				lib/sync/locks/bakery			\
+				plat/${PLAT}/${ARCH}			\
+				${PLAT_BL31_C_VPATH}
 
-vpath			%.S	lib/arch/${ARCH} common/psci			\
+vpath			%.S	lib/arch/${ARCH}			\
-				include/ plat/${PLAT}/${ARCH}			\
+				common/psci				\
-				lib/sync/locks/exclusive plat/common/${ARCH}	\
+				include					\
+				plat/${PLAT}/${ARCH}			\
+				lib/sync/locks/exclusive		\
+				plat/common/${ARCH}			\
 				arch/system/gic/${ARCH}			\
 				${PLAT_BL31_S_VPATH}
 

plat/fvp/platform.mk

@@ -28,11 +28,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-PLAT_INCLUDES :=	-Idrivers/arm/interconnect/cci-400/	\
+PLAT_INCLUDES		:=	-Idrivers/arm/interconnect/cci-400	\
-			-Idrivers/arm/peripherals/pl011/ 	\
+				-Idrivers/arm/peripherals/pl011		\
 				-Idrivers/power
 
-PLAT_BL1_C_VPATH :=	drivers/arm/interconnect/cci-400/	\
+PLAT_BL1_C_VPATH	:=	drivers/arm/interconnect/cci-400	\
 				drivers/arm/peripherals/pl011		\
 				lib/semihosting				\
 				lib/stdlib