boot/arm-trusted-firmware: override BL31 environment variable error
When building the arm-trusted-firmware, if the host environment has a value configured in the BL31 variable such as the following: export BL31=/tmp/bl31.elf This will cause the build of the bl31.elf to be skipped leading to the following build error: make[1]: Nothing to be done for 'bl31'. And then: readelf: Error: './output/build/arm-trusted-firmware-custom/build/versal/release/bl31/bl31.elf': No such file To fix this, clear the BL31 variable in the MAKE_OPTS, so that building the arm-trusted-firmware will build regardless of the host environment. Signed-off-by: Neal Frager <neal.frager@amd.com> Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 6019df8f99cb30efd6263b93753bd8bc46874b48) Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
committed by
Thomas Perale
parent
5f9c2ff313
commit
9ec0fee664
@@ -162,6 +162,8 @@ endif
|
||||
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y)
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31
|
||||
# Avoid BL31 environment variable from polluting the build
|
||||
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL31=
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT),y)
|
||||
|
||||
Reference in New Issue
Block a user