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>

diff --git a/Makefile b/Makefile
index ee778e9c0204977e2166e8860a983d8c7bf2a66d..71be313288ee1a8a7d94b506fea992d98625ba8a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,13 @@ else
        BUILD_TYPE      :=      release
 endif
 
-BL_COMMON_OBJS         :=      misc_helpers.o cache_helpers.o tlb_helpers.o            \
-                               std.o bl_common.o platform_helpers.o
+BL_COMMON_OBJS         :=      misc_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/    \
-                               -Iarch/system/gic -Icommon/psci                 \
-                               -Iinclude/stdlib -Iinclude/stdlib/sys           \
-                               -Iplat/${PLAT} ${PLAT_INCLUDES}
+INCLUDES               +=      -Ilib/include/                  \
+                               -Iinclude/${ARCH}/              \
+                               -Iinclude/                      \
+                               -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}

diff --git a/bl1/bl1.mk b/bl1/bl1.mk
index 012967a9099c9823f7854a82d71d252a15db8c55..50a245b44b9213c29c4c4745fb6d2c66b23b4048 100644 (file)
--- a/bl1/bl1.mk
+++ b/bl1/bl1.mk
@@ -28,19 +28,24 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-vpath                  %.c     plat/${PLAT} plat/${PLAT}/${ARCH}       \
-                               common/ lib/ arch/${ARCH}               \
+vpath                  %.c     plat/${PLAT}            \
+                               plat/${PLAT}/${ARCH}    \
+                               common                  \
+                               lib                     \
+                               arch/${ARCH}            \
                                ${PLAT_BL1_C_VPATH}
 
-vpath                  %.S     arch/${ARCH}/cpu plat/common/${ARCH}    \
-                               plat/${PLAT}/${ARCH}                    \
-                               include/ lib/arch/${ARCH}               \
+vpath                  %.S     arch/${ARCH}/cpu        \
+                               plat/common/${ARCH}     \
+                               plat/${PLAT}/${ARCH}    \
+                               include                 \
+                               lib/arch/${ARCH}        \
                                ${PLAT_BL1_S_VPATH}
 
-BL1_OBJS               +=      bl1_arch_setup.o \
-                               bl1_entrypoint.o \
-                               early_exceptions.o \
-                               bl1_main.o \
+BL1_OBJS               +=      bl1_arch_setup.o        \
+                               bl1_entrypoint.o        \
+                               early_exceptions.o      \
+                               bl1_main.o              \
                                cpu_helpers.o
 
 BL1_ENTRY_POINT                :=      reset_handler

diff --git a/bl2/bl2.mk b/bl2/bl2.mk
index 9c43e88c23e055a1810ffa4d5bd5408867df6a92..fb47669e656597165bfd12a63360369efd98b279 100644 (file)
--- a/bl2/bl2.mk
+++ b/bl2/bl2.mk
@@ -28,22 +28,26 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-vpath                  %.c     common/ lib/            \
-                               plat/${PLAT} plat/${PLAT}/${ARCH} arch/${ARCH}  \
+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/${ARCH}                \
+                               include                         \
+                               lib/sync/locks/exclusive        \
                                ${PLAT_BL2_S_VPATH}
 
-BL2_OBJS               +=      bl2_entrypoint.o \
-                               bl2_arch_setup.o \
-                               bl2_main.o \
-                               spinlock.o \
+BL2_OBJS               +=      bl2_entrypoint.o                \
+                               bl2_arch_setup.o                \
+                               bl2_main.o                      \
+                               spinlock.o                      \
                                early_exceptions.o
 
 BL2_ENTRY_POINT                :=      bl2_entrypoint
 BL2_MAPFILE            :=      bl2.map
 BL2_LINKERFILE         :=      bl2.ld
 
-CFLAGS                 +=      $(DEFINES)
+CFLAGS                 +=      $(DEFINES)

diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index e5bacd7b90a504050eb688db151d8d495b44d788..5c374aa134eba3a3ae0a8f12558ff2d7f433770a 100644 (file)
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -28,32 +28,40 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-vpath                  %.c     common/ lib/ arch/system/gic                    \
-                               plat/${PLAT} arch/${ARCH} common/psci           \
-                               lib/sync/locks/bakery/                          \
-                               plat/${PLAT}/${ARCH} ${PLAT_BL31_C_VPATH}
+vpath                  %.c     common                                  \
+                               lib                                     \
+                               arch/system/gic                         \
+                               plat/${PLAT}                            \
+                               arch/${ARCH}                            \
+                               common/psci                             \
+                               lib/sync/locks/bakery                   \
+                               plat/${PLAT}/${ARCH}                    \
+                               ${PLAT_BL31_C_VPATH}
 
-vpath                  %.S     lib/arch/${ARCH} common/psci                    \
-                               include/ plat/${PLAT}/${ARCH}                   \
-                               lib/sync/locks/exclusive plat/common/${ARCH}    \
-                               arch/system/gic/${ARCH}                         \
+vpath                  %.S     lib/arch/${ARCH}                        \
+                               common/psci                             \
+                               include                                 \
+                               plat/${PLAT}/${ARCH}                    \
+                               lib/sync/locks/exclusive                \
+                               plat/common/${ARCH}                     \
+                               arch/system/gic/${ARCH}                 \
                                ${PLAT_BL31_S_VPATH}
 
-BL31_OBJS              +=      bl31_arch_setup.o \
-                               bl31_entrypoint.o \
-                               exception_handlers.o \
-                               runtime_exceptions.o \
-                               bl31_main.o \
-                               psci_entry.o \
-                               psci_setup.o \
-                               psci_common.o \
-                               psci_afflvl_on.o \
-                               psci_main.o \
-                               psci_afflvl_off.o \
-                               psci_afflvl_suspend.o \
-                               spinlock.o \
-                               gic_v3_sysregs.o \
-                               bakery_lock.o \
+BL31_OBJS              +=      bl31_arch_setup.o                       \
+                               bl31_entrypoint.o                       \
+                               exception_handlers.o                    \
+                               runtime_exceptions.o                    \
+                               bl31_main.o                             \
+                               psci_entry.o                            \
+                               psci_setup.o                            \
+                               psci_common.o                           \
+                               psci_afflvl_on.o                        \
+                               psci_main.o                             \
+                               psci_afflvl_off.o                       \
+                               psci_afflvl_suspend.o                   \
+                               spinlock.o                              \
+                               gic_v3_sysregs.o                        \
+                               bakery_lock.o                           \
                                runtime_svc.o
 
 BL31_ENTRY_POINT       :=      bl31_entrypoint

diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk
index 94942f5a40af428b7dddd9a6d34074eccf3a3965..1765801de5b66b598b55b9b7b67f370e1081710e 100644 (file)
--- a/plat/fvp/platform.mk
+++ b/plat/fvp/platform.mk
@@ -28,54 +28,54 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-PLAT_INCLUDES :=       -Idrivers/arm/interconnect/cci-400/     \
-                       -Idrivers/arm/peripherals/pl011/        \
-                       -Idrivers/power
+PLAT_INCLUDES          :=      -Idrivers/arm/interconnect/cci-400      \
+                               -Idrivers/arm/peripherals/pl011         \
+                               -Idrivers/power
 
-PLAT_BL1_C_VPATH :=    drivers/arm/interconnect/cci-400/       \
-                       drivers/arm/peripherals/pl011           \
-                       lib/semihosting                         \
-                       lib/stdlib
+PLAT_BL1_C_VPATH       :=      drivers/arm/interconnect/cci-400        \
+                               drivers/arm/peripherals/pl011           \
+                               lib/semihosting                         \
+                               lib/stdlib
 
-PLAT_BL1_S_VPATH :=    lib/semihosting/${ARCH}
+PLAT_BL1_S_VPATH       :=      lib/semihosting/${ARCH}
 
-PLAT_BL2_C_VPATH :=    drivers/arm/interconnect/cci-400        \
-                       drivers/arm/peripherals/pl011           \
-                       lib/stdlib                              \
-                       lib/semihosting
+PLAT_BL2_C_VPATH       :=      drivers/arm/interconnect/cci-400        \
+                               drivers/arm/peripherals/pl011           \
+                               lib/stdlib                              \
+                               lib/semihosting
 
-PLAT_BL2_S_VPATH :=    lib/semihosting/${ARCH}
+PLAT_BL2_S_VPATH       :=      lib/semihosting/${ARCH}
 
-PLAT_BL31_C_VPATH :=   drivers/arm/interconnect/cci-400        \
-                       drivers/arm/peripherals/pl011           \
-                       lib/semihosting                         \
-                       lib/stdlib                              \
-                       drivers/power
+PLAT_BL31_C_VPATH      :=      drivers/arm/interconnect/cci-400        \
+                               drivers/arm/peripherals/pl011           \
+                               lib/semihosting                         \
+                               lib/stdlib                              \
+                               drivers/power
 
-PLAT_BL31_S_VPATH :=   lib/semihosting/${ARCH}
+PLAT_BL31_S_VPATH      :=      lib/semihosting/${ARCH}
 
-PLAT_BL_COMMON_OBJS := semihosting_call.o      \
-                       mmio.o                  \
-                       pl011.o                 \
-                       semihosting.o           \
-                       sysreg_helpers.o
+PLAT_BL_COMMON_OBJS    :=      semihosting_call.o                      \
+                               mmio.o                                  \
+                               pl011.o                                 \
+                               semihosting.o                           \
+                               sysreg_helpers.o
 
-BL1_OBJS +=            bl1_plat_setup.o \
-                       bl1_plat_helpers.o \
-                       fvp_helpers.o \
-                       fvp_common.o \
-                       cci400.o
+BL1_OBJS               +=      bl1_plat_setup.o                        \
+                               bl1_plat_helpers.o                      \
+                               fvp_helpers.o                           \
+                               fvp_common.o                            \
+                               cci400.o
 
-BL2_OBJS +=            bl2_plat_setup.o \
-                       fvp_common.o
+BL2_OBJS               +=      bl2_plat_setup.o                        \
+                               fvp_common.o
 
-BL31_OBJS +=           bl31_plat_setup.o \
-                       fvp_helpers.o \
-                       fvp_common.o \
-                       fvp_pm.o \
-                       fvp_pwrc.o \
-                       fvp_topology.o \
-                       fvp_gic.o \
-                       cci400.o \
-                       gic_v2.o \
-                       gic_v3.o
+BL31_OBJS              +=      bl31_plat_setup.o                       \
+                               fvp_helpers.o                           \
+                               fvp_common.o                            \
+                               fvp_pm.o                                \
+                               fvp_pwrc.o                              \
+                               fvp_topology.o                          \
+                               fvp_gic.o                               \
+                               cci400.o                                \
+                               gic_v2.o                                \
+                               gic_v3.o