From 551631aa58aff80e087f75a6afd822bf1624f4f6 Mon Sep 17 00:00:00 2001 From: Paul Beesley Date: Thu, 11 Apr 2019 13:27:39 +0100 Subject: [PATCH 1/2] plat/sgm: Remove redundant platform_oid.h This file is used when building the cert_create tool without using the 'standard' set of Arm OID values as defined in the TBBR specification (see tbbr_oid.h). This configuration is enabled by setting USE_TBBR_DEFS to 0 during build. At the moment this will fail because the header file included by this file was removed in commit bb41eb7a9dc3 ("cert: move platform_oid.h to include/tools_share for all platforms"). For the SGM platform this means that there is no current use for this file. Change-Id: I3c82983ada62330f1ab6be6d6c0cf489adabae7b Signed-off-by: Paul Beesley --- plat/arm/css/sgm/include/platform_oid.h | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 plat/arm/css/sgm/include/platform_oid.h 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 - -/* - * Required platform OIDs - * (Provided by included header) - */ From 573b4cd22698e8a4b39df2573e2e501b7538279e Mon Sep 17 00:00:00 2001 From: Paul Beesley Date: Thu, 11 Apr 2019 13:35:26 +0100 Subject: [PATCH 2/2] doc: Clarify cert_create build when USE_TBBR_DEFS=0 The user guide documentation for the cert_create tool needs to mention that a platform must have a platform_oid.h header file in order to successfully build the cert_create tool when USE_TBBR_DEFS is 0. Change-Id: I77f86a022d207e88a79c97741be3eafbfa0c86f1 Signed-off-by: Paul Beesley --- docs/user-guide.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 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= [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= 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: