From ea569a0afd6a2e9a84418cd18ddeaeefaa5eae39 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 11 Apr 2019 11:50:42 +0200 Subject: hab/caam: Fix compilation of caam driver when hab is disabled The caam driver needs the variable habv4_need_rng_software_self_test, but this is only declared when HABV4 is enabled. Instead of exporting a variable rather provide a function to test if a software selftest of the random number generator is needed. Signed-off-by: Sascha Hauer --- drivers/hab/habv4.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'drivers/hab/habv4.c') diff --git a/drivers/hab/habv4.c b/drivers/hab/habv4.c index ca95c01e7b..496fbe3ccd 100644 --- a/drivers/hab/habv4.c +++ b/drivers/hab/habv4.c @@ -392,8 +392,13 @@ static void habv4_display_event(uint8_t *data, uint32_t len) * self-test in ROM code. In this case, an HAB event is generated, and a * software self-test should be run. This variable is set to @c true by * habv4_get_status() when this occurs. */ -bool habv4_need_rng_software_self_test = false; -EXPORT_SYMBOL(habv4_need_rng_software_self_test); +static bool habv4_need_rng_software_self_test; + +bool caam_need_rng_software_selftest(void) +{ + return IS_ENABLED(CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_SELF_TEST) && + habv4_need_rng_software_self_test; +} #define RNG_FAIL_EVENT_SIZE 36 static uint8_t habv4_known_rng_fail_events[][RNG_FAIL_EVENT_SIZE] = { -- cgit v1.2.3