From 402e7c4ec633ed18810ebfb0af3cad42e03d867c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 18 Feb 2019 00:53:56 +0100 Subject: [PATCH] firmware: fix undefined symbol in emulator --- firmware/trezor.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/firmware/trezor.c b/firmware/trezor.c index c26ec0deda..90cf928adc 100644 --- a/firmware/trezor.c +++ b/firmware/trezor.c @@ -33,7 +33,9 @@ #include "gettext.h" #include "bl_check.h" #include "memzero.h" +#if !EMULATOR #include +#endif /* Screen timeout */ uint32_t system_millis_lock_start; @@ -99,17 +101,21 @@ int main(void) __stack_chk_guard = random32(); // this supports compiler provided unpredictable stack protection checks #endif +#if EMULATOR + memzero(HW_ENTROPY_DATA, HW_ENTROPY_LEN); +#endif + if (!is_mode_unprivileged()) { +#if !EMULATOR desig_get_unique_id((uint32_t*)HW_ENTROPY_DATA); +#endif timer_init(); #ifdef APPVER // enable MPU (Memory Protection Unit) mpu_config(); #endif } else { -#if EMULATOR - memzero(HW_ENTROPY_DATA, HW_ENTROPY_LEN); -#else +#if !EMULATOR // we are running in unprivileged mode // use fixed HW_ENTROPY memset(HW_ENTROPY_DATA, 0x3C, HW_ENTROPY_LEN);