Merge pull request #938 from masahir0y/tools_share

Collect headers shared between TF and host-tools into include/tools_share

3 files changed, 4 insertions, 8 deletions

diff --git a/include/common/firmware_image_package.h b/include/tools_share/firmware_image_package.h
index dcf16b48..dcf16b48 100644
--- a/include/common/firmware_image_package.h
+++ b/include/tools_share/firmware_image_package.h
diff --git a/include/plat/arm/board/common/board_arm_oid.h b/include/tools_share/tbbr_oid.h
index fc6cd792..7a340878 100644
--- a/include/plat/arm/board/common/board_arm_oid.h
+++ b/include/tools_share/tbbr_oid.h
@@ -1,21 +1,17 @@
 /*
- * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BOARD_ARM_OID_H__
-#define __BOARD_ARM_OID_H__
+#ifndef __TBBR_OID_H__
+#define __TBBR_OID_H__
 
 /*
  * The following is a list of OID values defined and reserved by ARM, which
  * are used to define the extension fields of the certificate structure, as
  * defined in the Trusted Board Boot Requirements (TBBR) specification,
  * ARM DEN0006C-1.
- *
- * Non-ARM platform owners that wish to align with the TBBR should define
- * constants with the same name in their own platform port(s), using their
- * own OIDs obtained from the ITU-T.
  */
 
 
@@ -140,4 +136,4 @@
 /* NonTrustedWorldBootloaderHash - BL33 */
 #define NON_TRUSTED_WORLD_BOOTLOADER_HASH_OID	"1.3.6.1.4.1.4128.2100.1201"
 
-#endif /* __BOARD_ARM_OID_H__ */
+#endif /* __TBBR_OID_H__ */
diff --git a/include/lib/stdlib/sys/uuid.h b/include/tools_share/uuid.h
index 6d935bd6..6d935bd6 100644
--- a/include/lib/stdlib/sys/uuid.h
+++ b/include/tools_share/uuid.h