Merge pull request #479 from jcastillo-arm/jc/tbbr_fip
Apply TBBR naming convention to the fip_create options
diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk
index bc381d5..5186f16 100644
--- a/drivers/auth/mbedtls/mbedtls_common.mk
+++ b/drivers/auth/mbedtls/mbedtls_common.mk
@@ -55,6 +55,5 @@
BL1_SOURCES += ${MBEDTLS_COMMON_SOURCES}
BL2_SOURCES += ${MBEDTLS_COMMON_SOURCES}
-DISABLE_PEDANTIC := 1
endif
diff --git a/drivers/auth/mbedtls/mbedtls_crypto.c b/drivers/auth/mbedtls/mbedtls_crypto.c
index 6a898dd..1a96e8f 100644
--- a/drivers/auth/mbedtls/mbedtls_crypto.c
+++ b/drivers/auth/mbedtls/mbedtls_crypto.c
@@ -174,7 +174,7 @@
/* Digest info should be an MBEDTLS_ASN1_SEQUENCE */
p = (unsigned char *)digest_info_ptr;
- end = (unsigned char *)(digest_info_ptr + digest_info_len);
+ end = p + digest_info_len;
rc = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED |
MBEDTLS_ASN1_SEQUENCE);
if (rc != 0) {
diff --git a/drivers/console/console.S b/drivers/console/console.S
index 40a6db9..b772363 100644
--- a/drivers/console/console.S
+++ b/drivers/console/console.S
@@ -79,6 +79,7 @@
mov x0, #0
adrp x3, console_base
str x0, [x3, :lo12:console_base]
+ ret
endfunc console_uninit
/* ---------------------------------------------
diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h
index 0f19b5c..c00b256 100644
--- a/include/drivers/auth/auth_mod.h
+++ b/include/drivers/auth/auth_mod.h
@@ -65,7 +65,7 @@
#define REGISTER_COT(_cot) \
const auth_img_desc_t *const cot_desc_ptr = \
(const auth_img_desc_t *const)&_cot[0]; \
- unsigned int auth_img_flags[sizeof(_cot)/sizeof(_cot[0])];
+ unsigned int auth_img_flags[sizeof(_cot)/sizeof(_cot[0])]
#endif /* TRUSTED_BOARD_BOOT */
diff --git a/tools/cert_create/include/cert.h b/tools/cert_create/include/cert.h
index 11381c9..8ef9f27 100644
--- a/tools/cert_create/include/cert.h
+++ b/tools/cert_create/include/cert.h
@@ -76,7 +76,7 @@
/* Macro to register the certificates used in the CoT */
#define REGISTER_COT(_certs) \
cert_t *certs = &_certs[0]; \
- const unsigned int num_certs = sizeof(_certs)/sizeof(_certs[0]);
+ const unsigned int num_certs = sizeof(_certs)/sizeof(_certs[0])
/* Exported variables */
extern cert_t *certs;
diff --git a/tools/cert_create/include/ext.h b/tools/cert_create/include/ext.h
index 0ede365..798bd1b 100644
--- a/tools/cert_create/include/ext.h
+++ b/tools/cert_create/include/ext.h
@@ -92,7 +92,7 @@
/* Macro to register the extensions used in the CoT */
#define REGISTER_EXTENSIONS(_ext) \
ext_t *extensions = &_ext[0]; \
- const unsigned int num_extensions = sizeof(_ext)/sizeof(_ext[0]);
+ const unsigned int num_extensions = sizeof(_ext)/sizeof(_ext[0])
/* Exported variables */
extern ext_t *extensions;
diff --git a/tools/cert_create/include/key.h b/tools/cert_create/include/key.h
index 6995a06..bd45f13 100644
--- a/tools/cert_create/include/key.h
+++ b/tools/cert_create/include/key.h
@@ -79,7 +79,7 @@
/* Macro to register the keys used in the CoT */
#define REGISTER_KEYS(_keys) \
key_t *keys = &_keys[0]; \
- const unsigned int num_keys = sizeof(_keys)/sizeof(_keys[0]);
+ const unsigned int num_keys = sizeof(_keys)/sizeof(_keys[0])
/* Exported variables */
extern key_t *keys;