diff options
| author | Scott Branden <scott.branden@broadcom.com> | 2017-04-10 11:45:52 -0700 |
|---|---|---|
| committer | Scott Branden <scott.branden@broadcom.com> | 2017-04-29 08:30:05 -0700 |
| commit | 53d9c9c85bc49845c4c40315e1ab29d627a1f8c3 (patch) | |
| tree | 57516f4cd65af83def781fa10124689b1275c2c2 /plat/arm | |
| parent | 264521bf40a10e5f70d03d70ddb1fadfd16c4108 (diff) | |
Move defines in utils.h to utils_def.h to fix shared header compile issues
utils.h is included in various header files for the defines in it.
Some of the other header files only contain defines. This allows the
header files to be shared between host and target builds for shared defines.
Recently types.h has been included in utils.h as well as some function
prototypes.
Because of the inclusion of types.h conflicts exist building host tools
abd these header files now. To solve this problem,
move the defines to utils_def.h and have this included by utils.h and
change header files to only include utils_def.h and not pick up the new
types.h being introduced.
Fixes ARM-software/tf-issues#461
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
Remove utils_def.h from utils.h
This patch removes utils_def.h from utils.h as it is not required.
And also makes a minor change to ensure Juno platform compiles.
Change-Id: I10cf1fb51e44a8fa6dcec02980354eb9ecc9fa29
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/board/juno/juno_trng.c | 2 | ||||
| -rw-r--r-- | plat/arm/css/common/css_bl2_setup.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plat/arm/board/juno/juno_trng.c b/plat/arm/board/juno/juno_trng.c index 2fcddcdb..9bb760f9 100644 --- a/plat/arm/board/juno/juno_trng.c +++ b/plat/arm/board/juno/juno_trng.c @@ -31,7 +31,7 @@ #include <assert.h> #include <mmio.h> #include <string.h> -#include <utils.h> +#include <utils_def.h> #include "juno_def.h" #define NSAMPLE_CLOCKS 1 /* min 1 cycle, max 231 cycles */ diff --git a/plat/arm/css/common/css_bl2_setup.c b/plat/arm/css/common/css_bl2_setup.c index 5361d897..65a98ba4 100644 --- a/plat/arm/css/common/css_bl2_setup.c +++ b/plat/arm/css/common/css_bl2_setup.c @@ -34,6 +34,7 @@ #include <mmio.h> #include <plat_arm.h> #include <string.h> +#include <utils.h> #include "css_scp_bootloader.h" /* Weak definition may be overridden in specific CSS based platform */ |