diff options
author | Evan Lloyd <evan.lloyd@arm.com> | 2015-12-02 18:56:06 +0000 |
---|---|---|
committer | Evan Lloyd <evan.lloyd@arm.com> | 2016-04-01 12:33:09 +0100 |
commit | e7f54dbd034fa319bd9ea07d7cc0bc0dcf46e096 (patch) | |
tree | 4da19bdcc9b5b6d0689d249657062c9378d307e4 /tools | |
parent | 1670d9df4d572bd6836ce2e74ff75cb7fd63cd54 (diff) | |
download | arm-trusted-firmware-e7f54dbd034fa319bd9ea07d7cc0bc0dcf46e096.tar.gz |
Make:Use environment variables for OS detection.
Add make helper files to select the appropriate settings for the build
environment. Selection is made in make_helpers/build_env.mk, which
selects other files to include using generic build environment settings.
The Trusted Firmware Makefile and supporting tool Makefiles are updated
to include build_env.mk instead of unix.mk.
NOTE: This change does not fully enable builds in other build
environments. It facilitates this without compromising the
existing build environments.
Change-Id: Ic4064ffe6ce158bbd16d7cc9f27dd4655a3580f6
Diffstat (limited to 'tools')
-rw-r--r-- | tools/cert_create/Makefile | 4 | ||||
-rw-r--r-- | tools/fip_create/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile index b19d618e2..8218ab71d 100644 --- a/tools/cert_create/Makefile +++ b/tools/cert_create/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -49,7 +49,7 @@ CFLAGS := -Wall -std=c99 MAKE_HELPERS_DIRECTORY := ../../make_helpers/ include ${MAKE_HELPERS_DIRECTORY}build_macros.mk -include ${MAKE_HELPERS_DIRECTORY}unix.mk +include ${MAKE_HELPERS_DIRECTORY}build_env.mk PLATFORM_ROOT := ../../plat/ include ${MAKE_HELPERS_DIRECTORY}plat_helpers.mk diff --git a/tools/fip_create/Makefile b/tools/fip_create/Makefile index 9f0bf7ac2..52e06a7ea 100644 --- a/tools/fip_create/Makefile +++ b/tools/fip_create/Makefile @@ -30,7 +30,7 @@ MAKE_HELPERS_DIRECTORY := ../../make_helpers/ include ${MAKE_HELPERS_DIRECTORY}build_macros.mk -include ${MAKE_HELPERS_DIRECTORY}unix.mk +include ${MAKE_HELPERS_DIRECTORY}build_env.mk PROJECT = fip_create OBJECTS = fip_create.o |