Merge remote-tracking branch 'upstream-public/pr/922' into development-proposed

This commit is contained in:
Gilles Peskine 2018-03-13 00:10:07 +01:00
commit 13678d251f

View File

@ -11,7 +11,6 @@
# #
# Configurations included: # Configurations included:
# default include/mbedtls/config.h # default include/mbedtls/config.h
# yotta yotta/module/mbedtls/config.h
# thread configs/config-thread.h # thread configs/config-thread.h
# suite-b configs/config-suite-b.h # suite-b configs/config-suite-b.h
# psk configs/config-ccm-psk-tls1_2.h # psk configs/config-ccm-psk-tls1_2.h
@ -102,11 +101,7 @@ log "mbed TLS $MBEDTLS_VERSION$GIT_VERSION"
log "$( arm-none-eabi-gcc --version | head -n1 )" log "$( arm-none-eabi-gcc --version | head -n1 )"
log "CFLAGS=$ARMGCC_FLAGS" log "CFLAGS=$ARMGCC_FLAGS"
# creates the yotta config
yotta/create-module.sh >/dev/null
doit default include/mbedtls/config.h doit default include/mbedtls/config.h
doit yotta yotta/module/mbedtls/config.h
doit thread configs/config-thread.h doit thread configs/config-thread.h
doit suite-b configs/config-suite-b.h doit suite-b configs/config-suite-b.h
doit psk configs/config-ccm-psk-tls1_2.h doit psk configs/config-ccm-psk-tls1_2.h