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>
This commit is contained in:
Ryan Harkin
Dan Handley
parent
25cff83ee4
commit
d7a6b0f8ad
22
Makefile
22
Makefile
|
|
@ -50,8 +50,13 @@ else
|
||||||
BUILD_TYPE := release
|
BUILD_TYPE := release
|
||||||
endif
|
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
|
ARCH ?= aarch64
|
||||||
|
|
||||||
# By default, build all platforms available
|
# By default, build all platforms available
|
||||||
|
|
@ -109,10 +114,15 @@ BL1_LINKERFILE := $(addprefix ${BUILD_BL1}/,${BL1_LINKERFILE})
|
||||||
BL2_LINKERFILE := $(addprefix ${BUILD_BL2}/,${BL2_LINKERFILE})
|
BL2_LINKERFILE := $(addprefix ${BUILD_BL2}/,${BL2_LINKERFILE})
|
||||||
BL31_LINKERFILE := $(addprefix ${BUILD_BL31}/,${BL31_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 \
|
ASFLAGS += -nostdinc -ffreestanding -Wa,--fatal-warnings \
|
||||||
-mgeneral-regs-only -D__ASSEMBLY__ ${INCLUDES}
|
-mgeneral-regs-only -D__ASSEMBLY__ ${INCLUDES}
|
||||||
|
|
|
||||||
23
bl1/bl1.mk
23
bl1/bl1.mk
|
|
@ -28,19 +28,24 @@
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
# 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}
|
${PLAT_BL1_C_VPATH}
|
||||||
|
|
||||||
vpath %.S arch/${ARCH}/cpu plat/common/${ARCH} \
|
vpath %.S arch/${ARCH}/cpu \
|
||||||
plat/${PLAT}/${ARCH} \
|
plat/common/${ARCH} \
|
||||||
include/ lib/arch/${ARCH} \
|
plat/${PLAT}/${ARCH} \
|
||||||
|
include \
|
||||||
|
lib/arch/${ARCH} \
|
||||||
${PLAT_BL1_S_VPATH}
|
${PLAT_BL1_S_VPATH}
|
||||||
|
|
||||||
BL1_OBJS += bl1_arch_setup.o \
|
BL1_OBJS += bl1_arch_setup.o \
|
||||||
bl1_entrypoint.o \
|
bl1_entrypoint.o \
|
||||||
early_exceptions.o \
|
early_exceptions.o \
|
||||||
bl1_main.o \
|
bl1_main.o \
|
||||||
cpu_helpers.o
|
cpu_helpers.o
|
||||||
|
|
||||||
BL1_ENTRY_POINT := reset_handler
|
BL1_ENTRY_POINT := reset_handler
|
||||||
|
|
|
||||||
22
bl2/bl2.mk
22
bl2/bl2.mk
|
|
@ -28,22 +28,26 @@
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
# 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}
|
${PLAT_BL2_C_VPATH}
|
||||||
|
|
||||||
vpath %.S lib/arch/${ARCH} \
|
vpath %.S lib/arch/${ARCH} \
|
||||||
include lib/sync/locks/exclusive \
|
include \
|
||||||
|
lib/sync/locks/exclusive \
|
||||||
${PLAT_BL2_S_VPATH}
|
${PLAT_BL2_S_VPATH}
|
||||||
|
|
||||||
BL2_OBJS += bl2_entrypoint.o \
|
BL2_OBJS += bl2_entrypoint.o \
|
||||||
bl2_arch_setup.o \
|
bl2_arch_setup.o \
|
||||||
bl2_main.o \
|
bl2_main.o \
|
||||||
spinlock.o \
|
spinlock.o \
|
||||||
early_exceptions.o
|
early_exceptions.o
|
||||||
|
|
||||||
BL2_ENTRY_POINT := bl2_entrypoint
|
BL2_ENTRY_POINT := bl2_entrypoint
|
||||||
BL2_MAPFILE := bl2.map
|
BL2_MAPFILE := bl2.map
|
||||||
BL2_LINKERFILE := bl2.ld
|
BL2_LINKERFILE := bl2.ld
|
||||||
|
|
||||||
CFLAGS += $(DEFINES)
|
CFLAGS += $(DEFINES)
|
||||||
|
|
|
||||||
54
bl31/bl31.mk
54
bl31/bl31.mk
|
|
@ -28,32 +28,40 @@
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
# 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 \
|
||||||
arch/system/gic/${ARCH} \
|
plat/${PLAT}/${ARCH} \
|
||||||
|
lib/sync/locks/exclusive \
|
||||||
|
plat/common/${ARCH} \
|
||||||
|
arch/system/gic/${ARCH} \
|
||||||
${PLAT_BL31_S_VPATH}
|
${PLAT_BL31_S_VPATH}
|
||||||
|
|
||||||
BL31_OBJS += bl31_arch_setup.o \
|
BL31_OBJS += bl31_arch_setup.o \
|
||||||
bl31_entrypoint.o \
|
bl31_entrypoint.o \
|
||||||
exception_handlers.o \
|
exception_handlers.o \
|
||||||
runtime_exceptions.o \
|
runtime_exceptions.o \
|
||||||
bl31_main.o \
|
bl31_main.o \
|
||||||
psci_entry.o \
|
psci_entry.o \
|
||||||
psci_setup.o \
|
psci_setup.o \
|
||||||
psci_common.o \
|
psci_common.o \
|
||||||
psci_afflvl_on.o \
|
psci_afflvl_on.o \
|
||||||
psci_main.o \
|
psci_main.o \
|
||||||
psci_afflvl_off.o \
|
psci_afflvl_off.o \
|
||||||
psci_afflvl_suspend.o \
|
psci_afflvl_suspend.o \
|
||||||
spinlock.o \
|
spinlock.o \
|
||||||
gic_v3_sysregs.o \
|
gic_v3_sysregs.o \
|
||||||
bakery_lock.o \
|
bakery_lock.o \
|
||||||
runtime_svc.o
|
runtime_svc.o
|
||||||
|
|
||||||
BL31_ENTRY_POINT := bl31_entrypoint
|
BL31_ENTRY_POINT := bl31_entrypoint
|
||||||
|
|
|
||||||
|
|
@ -28,54 +28,54 @@
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
# 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
|
-Idrivers/power
|
||||||
|
|
||||||
PLAT_BL1_C_VPATH := drivers/arm/interconnect/cci-400/ \
|
PLAT_BL1_C_VPATH := drivers/arm/interconnect/cci-400 \
|
||||||
drivers/arm/peripherals/pl011 \
|
drivers/arm/peripherals/pl011 \
|
||||||
lib/semihosting \
|
lib/semihosting \
|
||||||
lib/stdlib
|
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 \
|
PLAT_BL2_C_VPATH := drivers/arm/interconnect/cci-400 \
|
||||||
drivers/arm/peripherals/pl011 \
|
drivers/arm/peripherals/pl011 \
|
||||||
lib/stdlib \
|
lib/stdlib \
|
||||||
lib/semihosting
|
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 \
|
PLAT_BL31_C_VPATH := drivers/arm/interconnect/cci-400 \
|
||||||
drivers/arm/peripherals/pl011 \
|
drivers/arm/peripherals/pl011 \
|
||||||
lib/semihosting \
|
lib/semihosting \
|
||||||
lib/stdlib \
|
lib/stdlib \
|
||||||
drivers/power
|
drivers/power
|
||||||
|
|
||||||
PLAT_BL31_S_VPATH := lib/semihosting/${ARCH}
|
PLAT_BL31_S_VPATH := lib/semihosting/${ARCH}
|
||||||
|
|
||||||
PLAT_BL_COMMON_OBJS := semihosting_call.o \
|
PLAT_BL_COMMON_OBJS := semihosting_call.o \
|
||||||
mmio.o \
|
mmio.o \
|
||||||
pl011.o \
|
pl011.o \
|
||||||
semihosting.o \
|
semihosting.o \
|
||||||
sysreg_helpers.o
|
sysreg_helpers.o
|
||||||
|
|
||||||
BL1_OBJS += bl1_plat_setup.o \
|
BL1_OBJS += bl1_plat_setup.o \
|
||||||
bl1_plat_helpers.o \
|
bl1_plat_helpers.o \
|
||||||
fvp_helpers.o \
|
fvp_helpers.o \
|
||||||
fvp_common.o \
|
fvp_common.o \
|
||||||
cci400.o
|
cci400.o
|
||||||
|
|
||||||
BL2_OBJS += bl2_plat_setup.o \
|
BL2_OBJS += bl2_plat_setup.o \
|
||||||
fvp_common.o
|
fvp_common.o
|
||||||
|
|
||||||
BL31_OBJS += bl31_plat_setup.o \
|
BL31_OBJS += bl31_plat_setup.o \
|
||||||
fvp_helpers.o \
|
fvp_helpers.o \
|
||||||
fvp_common.o \
|
fvp_common.o \
|
||||||
fvp_pm.o \
|
fvp_pm.o \
|
||||||
fvp_pwrc.o \
|
fvp_pwrc.o \
|
||||||
fvp_topology.o \
|
fvp_topology.o \
|
||||||
fvp_gic.o \
|
fvp_gic.o \
|
||||||
cci400.o \
|
cci400.o \
|
||||||
gic_v2.o \
|
gic_v2.o \
|
||||||
gic_v3.o
|
gic_v3.o
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue