diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-06-22 09:40:48 +0100 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-06-27 16:45:20 +0100 |
| commit | e739d32ac6a213102da037db079f0af3c9bcb95b (patch) | |
| tree | 3e52b0487634d0b8eec0228d4b1b2534baaec4c0 /fwu | |
| parent | e4aa5f8f0136e217bea24c6bb713c9da5ac9089b (diff) | |
Build Firmware Update images by default when supported
This patch enables the compilation of the Firmware Update non-secure
images by default on platforms that support it. The FIRMWARE_UPDATE
build flag is no longer expected on the build command line ; instead
it is a platform makefile setting. Platforms that support Firmware
Update should explicitly set this variable to 1. This is now the case
for FVP and Juno.
In other words,
* On platforms that support Firmware Update,
'make all' will now build the TFTF, NS_BL1U and NS_BL2U binaries.
* On platforms that do not support Firmware Update,
'make all' will build just the TFTF binary.
Change-Id: Ib12c1cb06fee2b4b9933da0af1bc74350564f29d
Diffstat (limited to 'fwu')
| -rw-r--r-- | fwu/ns_bl1u/ns_bl1u.mk | 10 | ||||
| -rw-r--r-- | fwu/ns_bl2u/ns_bl2u.mk | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/fwu/ns_bl1u/ns_bl1u.mk b/fwu/ns_bl1u/ns_bl1u.mk index 6ecca25..d059c0c 100644 --- a/fwu/ns_bl1u/ns_bl1u.mk +++ b/fwu/ns_bl1u/ns_bl1u.mk @@ -28,7 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -NS_BL1U_SOURCES += drivers/io/io_fip.c \ +NS_BL1U_SOURCES := drivers/io/io_fip.c \ drivers/io/io_memmap.c \ framework/aarch64/arch.c \ framework/aarch64/asm_platform_weak.S \ @@ -53,3 +53,11 @@ NS_BL1U_SOURCES += drivers/io/io_fip.c \ plat/common/image_loader.c NS_BL1U_LINKERFILE := fwu/ns_bl1u/ns_bl1u.ld.S + + +ifneq (${USE_NVM},1) +ns_bl1u_nvm_error: + $(error "NS_BL1U requires the use of non-volatile memory, please build with USE_NVM=1") + +ns_bl1u: ns_bl1u_nvm_error +endif diff --git a/fwu/ns_bl2u/ns_bl2u.mk b/fwu/ns_bl2u/ns_bl2u.mk index 1c88fa3..e8179b4 100644 --- a/fwu/ns_bl2u/ns_bl2u.mk +++ b/fwu/ns_bl2u/ns_bl2u.mk @@ -28,7 +28,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -NS_BL2U_SOURCES += framework/aarch64/arch.c \ +NS_BL2U_SOURCES := framework/aarch64/arch.c \ framework/aarch64/asm_platform_weak.S \ framework/aarch64/exceptions.S \ framework/debug.c \ @@ -54,3 +54,10 @@ NS_BL2U_SOURCES += framework/aarch64/arch.c \ NS_BL2U_LINKERFILE := fwu/ns_bl2u/ns_bl2u.ld.S + +ifneq (${USE_NVM},1) +ns_bl2u_nvm_error: + $(error "NS_BL2U requires the use of non-volatile memory, please build with USE_NVM=1") + +ns_bl2u: ns_bl2u_nvm_error +endif |