Skip to content

Commit af00f18

Browse files
Add missing define guards
1 parent db7776d commit af00f18

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

examples/platform/silabs/OTAConfig.h

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
#include <platform/silabs/OTAImageProcessorImpl.h>
3030
#endif
3131

32+
#if (SL_MATTER_GN_BUILD == 0)
33+
#include "sl_matter_ota_config.h"
34+
#endif
35+
3236
class OTAConfig
3337
{
3438
public:

src/platform/silabs/CHIPPlatformConfig.h

+9-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626

2727
#include <stdint.h>
2828

29+
#if (SL_MATTER_GN_BUILD == 0)
30+
#if defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && (CHIP_CONFIG_ENABLE_ICD_SERVER == 1)
31+
#include "sl_matter_icd_config.h"
32+
#endif // defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && (CHIP_CONFIG_ENABLE_ICD_SERVER == 1)
33+
#endif // SL_MATTER_GN_BUILD
34+
2935
// ==================== General Platform Adaptations ====================
3036

3137
#define CHIP_CONFIG_ABORT() abort()
@@ -45,7 +51,8 @@
4551
#if CHIP_HAVE_CONFIG_H
4652
#include <crypto/CryptoBuildConfig.h>
4753
#endif
48-
#if (CHIP_CRYPTO_PLATFORM == 1)
54+
55+
#if (CHIP_CRYPTO_PLATFORM == 1) && !defined(SL_MBEDTLS_USE_TINYCRYPT)
4956
#include "psa/crypto.h"
5057

5158
#if !defined(CHIP_CONFIG_SHA256_CONTEXT_SIZE)
@@ -56,7 +63,7 @@
5663
#define CHIP_CONFIG_SHA256_CONTEXT_ALIGN psa_hash_operation_t
5764
#endif
5865

59-
#endif // CHIP_CRYPTO_PLATFORM
66+
#endif // (CHIP_CRYPTO_PLATFORM == 1) && !defined(SL_MBEDTLS_USE_TINYCRYPT)
6067

6168
// ==================== General Configuration Overrides ====================
6269

0 commit comments

Comments
 (0)