From 23106b81c82f50090cd4ae59857f4a05f93dd7fd Mon Sep 17 00:00:00 2001 From: Flavio Ceolin Date: Thu, 21 Sep 2023 23:42:51 -0700 Subject: [PATCH] random: Remove deprecated Kconfig symbol XOROSHIRO_RANDOM_GENERATOR has been deprecated in Zephyr 1.12 (???), time to remove it. Signed-off-by: Flavio Ceolin --- subsys/random/CMakeLists.txt | 4 ---- subsys/random/Kconfig | 5 ----- 2 files changed, 9 deletions(-) diff --git a/subsys/random/CMakeLists.txt b/subsys/random/CMakeLists.txt index 1cb72f2bea1..e8bbd0f0dd8 100644 --- a/subsys/random/CMakeLists.txt +++ b/subsys/random/CMakeLists.txt @@ -15,11 +15,7 @@ if (CONFIG_TIMER_RANDOM_GENERATOR) Use it carefully.") endif() -# XOROSHIRO builds the XOSHIRO implementation because a Kconfig choice cannot -# select another choice as a means of deprecating the symbol. Swapping out the -# implementation lets out-of-tree users still build until the symbol is removed. zephyr_library_sources_ifdef(CONFIG_TIMER_RANDOM_GENERATOR rand32_timer.c) -zephyr_library_sources_ifdef(CONFIG_XOROSHIRO_RANDOM_GENERATOR rand32_xoshiro128.c) zephyr_library_sources_ifdef(CONFIG_XOSHIRO_RANDOM_GENERATOR rand32_xoshiro128.c) zephyr_library_sources_ifdef(CONFIG_CTR_DRBG_CSPRNG_GENERATOR rand32_ctr_drbg.c) diff --git a/subsys/random/Kconfig b/subsys/random/Kconfig index d945bbbcec0..6629b0d6b08 100644 --- a/subsys/random/Kconfig +++ b/subsys/random/Kconfig @@ -57,11 +57,6 @@ config ENTROPY_DEVICE_RANDOM_GENERATOR selected if hardware entropy driver is designed to be a random number generator source. -config XOROSHIRO_RANDOM_GENERATOR - bool "Use Xoroshiro128+ as PRNG (DEPRECATED)" - help - This is deprecated, please use XOSHIRO_RANDOM_GENERATOR instead. - config XOSHIRO_RANDOM_GENERATOR bool "Use Xoshiro128++ as PRNG" depends on ENTROPY_HAS_DRIVER