diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-04-12 10:40:11 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-04-12 10:40:11 +0000 |
| commit | 5e2f1ce276e10fbdf54ca9f8db38fe3f3fecd25a (patch) | |
| tree | a2c6c28c4fae21eedee8a7df06eb238c8b3e6509 | |
| parent | 4b9d01d5b2dde5fb3e3608001e8d1b5b4546a48b (diff) | |
| parent | 573b4cd22698e8a4b39df2573e2e501b7538279e (diff) | |
| download | platform_external_arm-trusted-firmware-5e2f1ce276e10fbdf54ca9f8db38fe3f3fecd25a.tar.gz platform_external_arm-trusted-firmware-5e2f1ce276e10fbdf54ca9f8db38fe3f3fecd25a.tar.bz2 platform_external_arm-trusted-firmware-5e2f1ce276e10fbdf54ca9f8db38fe3f3fecd25a.zip | |
Merge changes from topic "pb/tbbr-oid" into integration
* changes:
doc: Clarify cert_create build when USE_TBBR_DEFS=0
plat/sgm: Remove redundant platform_oid.h
| -rw-r--r-- | docs/user-guide.rst | 6 | ||||
| -rw-r--r-- | plat/arm/css/sgm/include/platform_oid.h | 12 |
2 files changed, 4 insertions, 14 deletions
diff --git a/docs/user-guide.rst b/docs/user-guide.rst index fe8ce5ff9..b9f08716a 100644 --- a/docs/user-guide.rst +++ b/docs/user-guide.rst @@ -1219,11 +1219,13 @@ command: make PLAT=<platform> [DEBUG=1] [V=1] certtool For platforms that require their own IDs in certificate files, the generic -'cert_create' tool can be built with the following command: +'cert_create' tool can be built with the following command. Note that the target +platform must define its IDs within a ``platform_oid.h`` header file for the +build to succeed. :: - make USE_TBBR_DEFS=0 [DEBUG=1] [V=1] certtool + make PLAT=<platform> USE_TBBR_DEFS=0 [DEBUG=1] [V=1] certtool ``DEBUG=1`` builds the tool in debug mode. ``V=1`` makes the build process more verbose. The following command should be used to obtain help about the tool: diff --git a/plat/arm/css/sgm/include/platform_oid.h b/plat/arm/css/sgm/include/platform_oid.h deleted file mode 100644 index fd1854a03..000000000 --- a/plat/arm/css/sgm/include/platform_oid.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <plat/arm/board/common/board_arm_oid.h> - -/* - * Required platform OIDs - * (Provided by included header) - */ |