Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 09:34:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes I5ca7a004,Ibcb336a2 into integration

Browse source 
* changes:
  board/rdn1edge: use CREATE_SEQ helper macro to compare chip count
  build_macros: add create sequence helper function
This commit is contained in:
Manish Pandey 2020-02-18 21:54:25 +00:00 • committed by TrustedFirmware Code Review
commit 9c87e59e8e
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
make_helpers/build_macros.mk
View file

@ -67,6 +67,17 @@ $(foreach d,$(0-9),$(eval __numeric := $(subst $(d),,$(__numeric))))
$(if $(__numeric),$(error $(1) must be numeric)) $(if $(__numeric),$(error $(1) must be numeric))
endef endef
# CREATE_SEQ is a recursive function to create sequence of numbers from 1 to
# $(2) and assign the sequence to $(1)
define CREATE_SEQ
$(if $(word $(2), $($(1))),\
$(eval $(1) += $(words $($(1))))\
$(eval $(1) := $(filter-out 0,$($(1)))),\
$(eval $(1) += $(words $($(1))))\
$(call CREATE_SEQ,$(1),$(2))\
)
endef
# IMG_LINKERFILE defines the linker script corresponding to a BL stage # IMG_LINKERFILE defines the linker script corresponding to a BL stage
# $(1) = BL stage (2, 30, 31, 32, 33) # $(1) = BL stage (2, 30, 31, 32, 33)
define IMG_LINKERFILE define IMG_LINKERFILE

5
plat/arm/board/rdn1edge/platform.mk
View file

@ -51,8 +51,9 @@ NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb
# Add the NT_FW_CONFIG to FIP and specify the same to certtool # Add the NT_FW_CONFIG to FIP and specify the same to certtool
$(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config)) $(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config))
ifneq ($(CSS_SGI_CHIP_COUNT),$(filter $(CSS_SGI_CHIP_COUNT),1 2)) $(eval $(call CREATE_SEQ,SEQ,2))
$(error "Chip count for RDN1Edge platform should either 1 or 2, currently \ ifneq ($(CSS_SGI_CHIP_COUNT),$(filter $(CSS_SGI_CHIP_COUNT),$(SEQ)))
$(error "Chip count for RDN1Edge platform should be one of $(SEQ), currently \
set to ${CSS_SGI_CHIP_COUNT}.") set to ${CSS_SGI_CHIP_COUNT}.")
endif endif