mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-08 05:43:53 +00:00
09d40e0e08
Enforce full include path for includes. Deprecate old paths.
The following folders inside include/lib have been left unchanged:
- include/lib/cpus/${ARCH}
- include/lib/el3_runtime/${ARCH}
The reason for this change is that having a global namespace for
includes isn't a good idea. It defeats one of the advantages of having
folders and it introduces problems that are sometimes subtle (because
you may not know the header you are actually including if there are two
of them).
For example, this patch had to be created because two headers were
called the same way: e0ea0928d5 ("Fix gpio includes of mt8173 platform
to avoid collision."). More recently, this patch has had similar
problems: 46f9b2c3a2 ("drivers: add tzc380 support").
This problem was introduced in commit 4ecca33988 ("Move include and
source files to logical locations"). At that time, there weren't too
many headers so it wasn't a real issue. However, time has shown that
this creates problems.
Platforms that want to preserve the way they include headers may add the
removed paths to PLAT_INCLUDES, but this is discouraged.
Change-Id: I39dc53ed98f9e297a5966e723d1936d6ccf2fc8f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
87 lines
2.3 KiB
Makefile
87 lines
2.3 KiB
Makefile
#
|
|
# Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
|
#
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
#
|
|
|
|
ifneq (${MBEDTLS_COMMON_MK},1)
|
|
MBEDTLS_COMMON_MK := 1
|
|
|
|
# MBEDTLS_DIR must be set to the mbed TLS main directory (it must contain
|
|
# the 'include' and 'library' subdirectories).
|
|
ifeq (${MBEDTLS_DIR},)
|
|
$(error Error: MBEDTLS_DIR not set)
|
|
endif
|
|
|
|
MBEDTLS_INC = -I${MBEDTLS_DIR}/include
|
|
|
|
# Specify mbed TLS configuration file
|
|
MBEDTLS_CONFIG_FILE := "<drivers/auth/mbedtls/mbedtls_config.h>"
|
|
$(eval $(call add_define,MBEDTLS_CONFIG_FILE))
|
|
|
|
MBEDTLS_SOURCES += drivers/auth/mbedtls/mbedtls_common.c
|
|
|
|
|
|
LIBMBEDTLS_SRCS := $(addprefix ${MBEDTLS_DIR}/library/, \
|
|
asn1parse.c \
|
|
asn1write.c \
|
|
memory_buffer_alloc.c \
|
|
oid.c \
|
|
platform.c \
|
|
platform_util.c \
|
|
bignum.c \
|
|
md.c \
|
|
md_wrap.c \
|
|
pk.c \
|
|
pk_wrap.c \
|
|
pkparse.c \
|
|
pkwrite.c \
|
|
sha256.c \
|
|
sha512.c \
|
|
ecdsa.c \
|
|
ecp_curves.c \
|
|
ecp.c \
|
|
rsa.c \
|
|
rsa_internal.c \
|
|
x509.c \
|
|
x509_crt.c \
|
|
)
|
|
|
|
# The platform may define the variable 'TF_MBEDTLS_KEY_ALG' to select the key
|
|
# algorithm to use. If the variable is not defined, select it based on algorithm
|
|
# used for key generation `KEY_ALG`. If `KEY_ALG` is not defined or is
|
|
# defined to `rsa`/`rsa_1_5`, then set the variable to `rsa`.
|
|
ifeq (${TF_MBEDTLS_KEY_ALG},)
|
|
ifeq (${KEY_ALG}, ecdsa)
|
|
TF_MBEDTLS_KEY_ALG := ecdsa
|
|
else
|
|
TF_MBEDTLS_KEY_ALG := rsa
|
|
endif
|
|
endif
|
|
|
|
ifeq (${HASH_ALG}, sha384)
|
|
TF_MBEDTLS_HASH_ALG_ID := TF_MBEDTLS_SHA384
|
|
else ifeq (${HASH_ALG}, sha512)
|
|
TF_MBEDTLS_HASH_ALG_ID := TF_MBEDTLS_SHA512
|
|
else
|
|
TF_MBEDTLS_HASH_ALG_ID := TF_MBEDTLS_SHA256
|
|
endif
|
|
|
|
ifeq (${TF_MBEDTLS_KEY_ALG},ecdsa)
|
|
TF_MBEDTLS_KEY_ALG_ID := TF_MBEDTLS_ECDSA
|
|
else ifeq (${TF_MBEDTLS_KEY_ALG},rsa)
|
|
TF_MBEDTLS_KEY_ALG_ID := TF_MBEDTLS_RSA
|
|
else ifeq (${TF_MBEDTLS_KEY_ALG},rsa+ecdsa)
|
|
TF_MBEDTLS_KEY_ALG_ID := TF_MBEDTLS_RSA_AND_ECDSA
|
|
else
|
|
$(error "TF_MBEDTLS_KEY_ALG=${TF_MBEDTLS_KEY_ALG} not supported on mbed TLS")
|
|
endif
|
|
|
|
# Needs to be set to drive mbed TLS configuration correctly
|
|
$(eval $(call add_define,TF_MBEDTLS_KEY_ALG_ID))
|
|
$(eval $(call add_define,TF_MBEDTLS_HASH_ALG_ID))
|
|
|
|
|
|
$(eval $(call MAKE_LIB,mbedtls))
|
|
|
|
endif
|