aboutsummaryrefslogtreecommitdiff
path: root/include/bl32
diff options
context:
space:
mode:
authorScott Branden <scott.branden@broadcom.com>2017-04-10 11:45:52 -0700
committerScott Branden <scott.branden@broadcom.com>2017-04-29 08:30:05 -0700
commit53d9c9c85bc49845c4c40315e1ab29d627a1f8c3 (patch)
tree57516f4cd65af83def781fa10124689b1275c2c2 /include/bl32
parent264521bf40a10e5f70d03d70ddb1fadfd16c4108 (diff)
downloadtrusted-firmware-a-53d9c9c85bc49845c4c40315e1ab29d627a1f8c3.tar.gz
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 'include/bl32')
-rw-r--r--include/bl32/payloads/tlk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bl32/payloads/tlk.h b/include/bl32/payloads/tlk.h
index d355313ea9..1a83b1f78c 100644
--- a/include/bl32/payloads/tlk.h
+++ b/include/bl32/payloads/tlk.h
@@ -31,7 +31,7 @@
#ifndef __TLK_H__
#define __TLK_H__
-#include <utils.h>
+#include <utils_def.h>
/*
* Generate function IDs for the Trusted OS/Apps