aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2021-02-03 15:10:50 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-02-03 15:10:50 +0000
commit6d0dcc7d96eac9532237194acbe6a1468128e072 (patch)
treea536d5401d79d7285a7195f6ff2e2f3c48c8a469
parent9bc3007d3bb9363dbd5f6655d2b17d599e22bac4 (diff)
parent5e508f06a0d9a8fdfdaedc47ab374ae4af2a6c84 (diff)
downloadplatform_external_arm-trusted-firmware-6d0dcc7d96eac9532237194acbe6a1468128e072.tar.gz
platform_external_arm-trusted-firmware-6d0dcc7d96eac9532237194acbe6a1468128e072.tar.bz2
platform_external_arm-trusted-firmware-6d0dcc7d96eac9532237194acbe6a1468128e072.zip
Merge "plat/arm:juno: fix parallel build issue for romlib config" into integration
-rw-r--r--plat/arm/board/juno/platform.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/board/juno/platform.mk
index 78704b583..61cfb610c 100644
--- a/plat/arm/board/juno/platform.mk
+++ b/plat/arm/board/juno/platform.mk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2013-2021, ARM Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -108,7 +108,7 @@ ifeq ($(USE_ROMLIB),1)
all : bl1_romlib.bin
endif
-bl1_romlib.bin : $(BUILD_PLAT)/bl1.bin $(BUILD_PLAT)/romlib/romlib.bin
+bl1_romlib.bin : $(BUILD_PLAT)/bl1.bin romlib.bin
@echo "Building combined BL1 and ROMLIB binary for Juno $@"
./lib/romlib/gen_combined_bl1_romlib.sh -o bl1_romlib.bin $(BUILD_PLAT)