[mynewt-core] 01/02: crypto: mbedtls: Fix pic32mz builds

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit 6d32885300b7f6e6b730c90e8e0eb8cdb581f667
Author: Jerzy Kasenberg <je...@apache.org>
AuthorDate: Sat Jun 5 01:10:52 2021 +0200

    crypto: mbedtls: Fix pic32mz builds
    
    Some time ago include of <syscfg/syscfg.h> was changed
    in many files to <os/mynewt.h>.
    
    This change prevents build of mbedtls for pic32mz chips
    due to name conflict:
    repos/apache-mynewt-core/crypto/mbedtls/src/aes.c:418:17: error: conflicting type qualifiers for 'RCON'
     static uint32_t RCON[10];
    microchip\xc32\v3.01\pic32mx\include\proc\pic32mz-ef\p32mz2048efh064.h:646:28: note: previous declaration of 'RCON' was here
     extern volatile uint32_t   RCON __attribute__((section("sfrs"), address(0xBF801240)));
    
    This inclusion of mynewt.h is not really needed to build mbedtls library so this
    reverts it back to what it used to be.
---
 crypto/mbedtls/include/mbedtls/config_mynewt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/mbedtls/include/mbedtls/config_mynewt.h b/crypto/mbedtls/include/mbedtls/config_mynewt.h
index 82858d2..1c7d634 100644
--- a/crypto/mbedtls/include/mbedtls/config_mynewt.h
+++ b/crypto/mbedtls/include/mbedtls/config_mynewt.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#include "os/mynewt.h"
+#include <syscfg/syscfg.h>
 
 #undef MBEDTLS_HAVE_TIME /* we have no time.h */
 #undef MBEDTLS_HAVE_TIME_DATE