Skip to content

Commit aeb8822

Browse files
committed
[nrf toup][Zephyr] Update config name
Rename CONFIG_MBEDTLS_ZEPHYR_ENTROPY to CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent c0a900e commit aeb8822

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/platform/Zephyr/PlatformManagerImpl.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ PlatformManagerImpl PlatformManagerImpl::sInstance{ sChipThreadStack };
4545

4646
static k_timer sOperationalHoursSavingTimer;
4747

48-
#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
48+
#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
4949
static bool sChipStackEntropySourceAdded = false;
5050
static int app_entropy_source(void * data, unsigned char * output, size_t len, size_t * olen)
5151
{
@@ -72,7 +72,7 @@ static int app_entropy_source(void * data, unsigned char * output, size_t len, s
7272

7373
return ret;
7474
}
75-
#endif // !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
75+
#endif // !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
7676

7777
void PlatformManagerImpl::OperationalHoursSavingTimerEventHandler(k_timer * timer)
7878
{
@@ -117,24 +117,24 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
117117
{
118118
CHIP_ERROR err;
119119

120-
#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
120+
#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
121121
// Minimum required from source before entropy is released ( with mbedtls_entropy_func() ) (in bytes)
122122
const size_t kThreshold = 16;
123-
#endif // !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
123+
#endif // !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
124124

125125
// Initialize the configuration system.
126126
err = Internal::ZephyrConfig::Init();
127127
SuccessOrExit(err);
128128

129-
#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
129+
#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
130130
if (!sChipStackEntropySourceAdded)
131131
{
132132
// Add entropy source based on Zephyr entropy driver
133133
err = chip::Crypto::add_entropy_source(app_entropy_source, NULL, kThreshold);
134134
SuccessOrExit(err);
135135
sChipStackEntropySourceAdded = true;
136136
}
137-
#endif // !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY)
137+
#endif // !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
138138

139139
// Call _InitChipStack() on the generic implementation base class to finish the initialization process.
140140
err = Internal::GenericPlatformManagerImpl_Zephyr<PlatformManagerImpl>::_InitChipStack();

0 commit comments

Comments
 (0)