FVP,Juno: switch FVP and Juno to use generic TBBR OID header
The header tbbr_oid.h contains OIDs obtained by ARM Ltd.
so there is no good reason to use platform_oid.h
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
diff --git a/plat/arm/board/common/board_arm_trusted_boot.c b/plat/arm/board/common/board_arm_trusted_boot.c
index eb1dc8c..391ae45 100644
--- a/plat/arm/board/common/board_arm_trusted_boot.c
+++ b/plat/arm/board/common/board_arm_trusted_boot.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,9 +7,9 @@
#include <arm_def.h>
#include <assert.h>
#include <platform.h>
-#include <platform_oid.h>
#include <stdint.h>
#include <string.h>
+#include <tbbr_oid.h>
/* Weak definition may be overridden in specific platform */
#pragma weak plat_match_rotpk
diff --git a/plat/arm/board/fvp/fvp_trusted_boot.c b/plat/arm/board/fvp/fvp_trusted_boot.c
index 51d3083..d1e8b9f 100644
--- a/plat/arm/board/fvp/fvp_trusted_boot.c
+++ b/plat/arm/board/fvp/fvp_trusted_boot.c
@@ -1,13 +1,14 @@
/*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <assert.h>
-#include <platform_oid.h>
#include <stdint.h>
#include <string.h>
+#include <tbbr_oid.h>
+
#include "fvp_def.h"
/*
diff --git a/plat/arm/board/fvp/include/platform_oid.h b/plat/arm/board/fvp/include/platform_oid.h
deleted file mode 100644
index c64155f..0000000
--- a/plat/arm/board/fvp/include/platform_oid.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#include <tbbr_oid.h>
-
-/*
- * Required platform OIDs
- * (Provided by included header)
- */
diff --git a/plat/arm/board/juno/include/platform_oid.h b/plat/arm/board/juno/include/platform_oid.h
deleted file mode 100644
index c64155f..0000000
--- a/plat/arm/board/juno/include/platform_oid.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#include <tbbr_oid.h>
-
-/*
- * Required platform OIDs
- * (Provided by included header)
- */
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
index 58fc94e..3c20769 100644
--- a/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@ -87,6 +87,9 @@
# Enable new version of image loading on ARM platforms
LOAD_IMAGE_V2 := 1
+# Use generic OID definition (tbbr_oid.h)
+USE_TBBR_DEFS := 1
+
PLAT_INCLUDES += -Iinclude/common/tbbr \
-Iinclude/plat/arm/common