diff options
| author | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2020-08-13 05:56:33 +0100 |
|---|---|---|
| committer | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2020-08-23 05:41:13 +0100 |
| commit | fafd3ec9c954cbc5430dc24bdf5c46b97034c832 (patch) | |
| tree | 2c8387aff4c2f7f1b7a2f5bd0873ed444e188d14 /tools | |
| parent | 8d0a3bb38d3c74e791d45f6cbfbd5da84d32194a (diff) | |
| download | platform_external_arm-trusted-firmware-fafd3ec9c954cbc5430dc24bdf5c46b97034c832.tar.gz platform_external_arm-trusted-firmware-fafd3ec9c954cbc5430dc24bdf5c46b97034c832.tar.bz2 platform_external_arm-trusted-firmware-fafd3ec9c954cbc5430dc24bdf5c46b97034c832.zip | |
tools: Get the tool's binary name from the main makefile
Currently, the tool's makefile override the tool's binary name
which is already been defined in the main makefile.
Hence fix is provided so that the tool's makefile get the tool's
binary name from the main makefile instead of overriding it.
Change-Id: I8af2bd391a96bba2dbcddef711338a94ebf5f038
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cert_create/Makefile | 3 | ||||
| -rw-r--r-- | tools/encrypt_fw/Makefile | 5 | ||||
| -rw-r--r-- | tools/fiptool/Makefile | 4 | ||||
| -rw-r--r-- | tools/sptool/Makefile | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile index 19f736f07..418e06cf3 100644 --- a/tools/cert_create/Makefile +++ b/tools/cert_create/Makefile @@ -4,11 +4,10 @@ # SPDX-License-Identifier: BSD-3-Clause # -PROJECT := cert_create PLAT := none V ?= 0 DEBUG := 0 -BINARY := ${PROJECT}${BIN_EXT} +BINARY := $(notdir ${CRTTOOL}) OPENSSL_DIR := /usr COT := tbbr diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile index cb81d0b2e..ebbc66a8e 100644 --- a/tools/encrypt_fw/Makefile +++ b/tools/encrypt_fw/Makefile @@ -1,14 +1,13 @@ # -# Copyright (c) 2019, Linaro Limited. All rights reserved. +# Copyright (c) 2019-2020, Linaro Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -PROJECT := encrypt_fw V ?= 0 BUILD_INFO ?= 1 DEBUG := 0 -BINARY := ${PROJECT}${BIN_EXT} +BINARY := $(notdir ${ENCTOOL}) OPENSSL_DIR := /usr OBJECTS := src/encrypt.o \ diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile index ef3501432..0ede6cebb 100644 --- a/tools/fiptool/Makefile +++ b/tools/fiptool/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -8,7 +8,7 @@ MAKE_HELPERS_DIRECTORY := ../../make_helpers/ include ${MAKE_HELPERS_DIRECTORY}build_macros.mk include ${MAKE_HELPERS_DIRECTORY}build_env.mk -PROJECT := fiptool${BIN_EXT} +PROJECT := $(notdir ${FIPTOOL}) OBJECTS := fiptool.o tbbr_config.o V ?= 0 diff --git a/tools/sptool/Makefile b/tools/sptool/Makefile index 9325207c4..f724c265a 100644 --- a/tools/sptool/Makefile +++ b/tools/sptool/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2018, Arm Limited. All rights reserved. +# Copyright (c) 2018-2020, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -8,7 +8,7 @@ MAKE_HELPERS_DIRECTORY := ../../make_helpers/ include ${MAKE_HELPERS_DIRECTORY}build_macros.mk include ${MAKE_HELPERS_DIRECTORY}build_env.mk -PROJECT := sptool${BIN_EXT} +PROJECT := $(notdir ${SPTOOL}) OBJECTS := sptool.o V ?= 0 |