diff options
author | danh-arm <dan.handley@arm.com> | 2017-05-24 14:20:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-24 14:20:20 +0100 |
commit | e715e676e36eda6ef23469b63adb14a98ccce3e0 (patch) | |
tree | 9d9b740e84f4fed8fee0f60251298feeb2d6744a /plat/arm | |
parent | c1de3fdd32ff1848286fbe642a15f148f6bbf9a3 (diff) | |
parent | 232c6b34b5d2147be8765ced7b827ee5b1c1bcb5 (diff) |
Merge pull request #938 from masahir0y/tools_share
Collect headers shared between TF and host-tools into include/tools_share
Diffstat (limited to 'plat/arm')
-rw-r--r-- | plat/arm/board/common/board_arm_trusted_boot.c | 4 | ||||
-rw-r--r-- | plat/arm/board/fvp/fvp_trusted_boot.c | 5 | ||||
-rw-r--r-- | plat/arm/board/fvp/include/platform_oid.h | 11 | ||||
-rw-r--r-- | plat/arm/board/juno/include/platform_oid.h | 11 | ||||
-rw-r--r-- | plat/arm/common/arm_common.mk | 3 |
5 files changed, 8 insertions, 26 deletions
diff --git a/plat/arm/board/common/board_arm_trusted_boot.c b/plat/arm/board/common/board_arm_trusted_boot.c index eb1dc8c2..391ae45c 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 51d30830..d1e8b9f5 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 5ef1580b..00000000 --- a/plat/arm/board/fvp/include/platform_oid.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#include "../../../../../include/plat/arm/board/common/board_arm_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 5ef1580b..00000000 --- a/plat/arm/board/juno/include/platform_oid.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#include "../../../../../include/plat/arm/board/common/board_arm_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 58fc94ec..3c207698 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -87,6 +87,9 @@ SEPARATE_CODE_AND_RODATA := 1 # 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 |