From 2f42f804837cbd67063be28e3460ada7d718bc34 Mon Sep 17 00:00:00 2001 From: Jens Wiklander <jens.wiklander@linaro.org> Date: Wed, 4 Apr 2018 13:46:49 +0200 Subject: [PATCH] juno: scp binaries renamed BL0 has been renamed to SCP_BL1. Bl30 has been renamed to SCP_Bl2. Update makefile accordingly Acked-by: Joakim Bech <joakim.bech@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> --- juno.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/juno.mk b/juno.mk index 1135739..93d64cd 100644 --- a/juno.mk +++ b/juno.mk @@ -38,7 +38,7 @@ ARM_TF_EXPORTS ?= \ CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" ARM_TF_FLAGS ?= \ - SCP_BL2=$(ROOT)/vexpress-firmware/SOFTWARE/bl30.bin \ + SCP_BL2=$(ROOT)/vexpress-firmware/SOFTWARE/scp_bl2.bin \ BL32=$(OPTEE_OS_HEADER_V2_BIN) \ BL32_EXTRA1=$(OPTEE_OS_PAGER_V2_BIN) \ BL32_EXTRA2=$(OPTEE_OS_PAGEABLE_V2_BIN) \ @@ -155,7 +155,7 @@ FTP-UPLOAD = ftp-upload -v --host $(JUNO_IP) --dir SOFTWARE flash: @test -n "$(JUNO_IP)" || \ (echo "JUNO_IP not set" ; exit 1) - $(FTP-UPLOAD) $(ROOT)/vexpress-firmware/SOFTWARE/bl0.bin + $(FTP-UPLOAD) $(ROOT)/vexpress-firmware/SOFTWARE/scp_bl1.bin $(FTP-UPLOAD) $(ARM_TF_PATH)/build/juno/release/bl1.bin $(FTP-UPLOAD) $(ARM_TF_PATH)/build/juno/release/fip.bin $(FTP-UPLOAD) $(ROOT)/linux/arch/arm64/boot/Image -- GitLab