diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-06-20 11:37:04 +0100 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-06-20 14:44:55 +0100 |
| commit | e4aa5f8f0136e217bea24c6bb713c9da5ac9089b (patch) | |
| tree | 35f4d96a16b01357ddcf370a0a0f513d5cfb38ae /framework | |
| parent | f70591af5c1f38318969d51429a70beca9734289 (diff) | |
Fix NS_BL1U & NS_BL2U makefiles
Since commit 8eccdb813efc ("Compile files of stdlib separately"),
the C standard library files are compiled separately. However, the
makefiles for the NS_BL1U and NS_BL2U images haven't been updated
accordingly and still include the former std.c file, which doesn't
exist anymore. As a result, the NS_BL1U and NS_BL2U images fail
to build at the moment.
This patch defines the list of source files for the C standard
library in the framework.mk makefile. This provides an easy way
for any image built by the TFTF build system to include these
files. The TFTF, NS_BL1U and NS_BL2U makefiles have been updated
to make use of it.
Change-Id: Id8fc3c9cab7864570d56bb351836f485db742d6e
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/framework.mk | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/framework/framework.mk b/framework/framework.mk index 52c94d9..b4f9e28 100644 --- a/framework/framework.mk +++ b/framework/framework.mk @@ -34,6 +34,21 @@ FRAMEWORK_INCLUDES := -Iframework/include \ -Iinclude/common \ -I${AUTOGEN_DIR} +# Standard C library source files +STD_LIB_SOURCES := lib/stdlib/abort.c \ + lib/stdlib/assert.c \ + lib/stdlib/mem.c \ + lib/stdlib/printf.c \ + lib/stdlib/putchar.c \ + lib/stdlib/puts.c \ + lib/stdlib/rand.c \ + lib/stdlib/strchr.c \ + lib/stdlib/strcmp.c \ + lib/stdlib/strlen.c \ + lib/stdlib/strncmp.c \ + lib/stdlib/strncpy.c \ + lib/stdlib/subr_prf.c + FRAMEWORK_SOURCES := ${AUTOGEN_DIR}/tests_list.c \ framework/aarch64/arch.c \ framework/aarch64/asm_platform_weak.S \ @@ -58,19 +73,7 @@ FRAMEWORK_SOURCES := ${AUTOGEN_DIR}/tests_list.c \ lib/psci/psci.c \ lib/smc/asm_smc.S \ lib/smc/smc.c \ - lib/stdlib/abort.c \ - lib/stdlib/assert.c \ - lib/stdlib/mem.c \ - lib/stdlib/printf.c \ - lib/stdlib/putchar.c \ - lib/stdlib/puts.c \ - lib/stdlib/rand.c \ - lib/stdlib/strchr.c \ - lib/stdlib/strcmp.c \ - lib/stdlib/strlen.c \ - lib/stdlib/strncmp.c \ - lib/stdlib/strncpy.c \ - lib/stdlib/subr_prf.c \ + ${STD_LIB_SOURCES} \ lib/trusted_os/trusted_os.c \ lib/utils/mp_printf.c \ lib/utils/uuid.c \ |