From cde70534f731fd5d61d9b71ffee9ef5673d26ffe Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 10 May 2021 05:53:19 -0700 Subject: [PATCH] always resolve (#2678) --- firmware/controllers/flash_main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp index d1674d67a5..ca353d505b 100644 --- a/firmware/controllers/flash_main.cpp +++ b/firmware/controllers/flash_main.cpp @@ -172,17 +172,18 @@ static persisted_configuration_state_e doReadConfiguration(flashaddr_t address) */ static persisted_configuration_state_e readConfiguration() { efiAssert(CUSTOM_ERR_ASSERT, getCurrentRemainingStack() > EXPECTED_REMAINING_STACK, "read f", PC_ERROR); + auto firstCopyAddr = getFlashAddrFirstCopy(); + auto secondyCopyAddr = getFlashAddrSecondCopy(); + #if HW_CHECK_MODE persisted_configuration_state_e result = PC_OK; resetConfigurationExt(DEFAULT_ENGINE_TYPE PASS_ENGINE_PARAMETER_SUFFIX); #else // HW_CHECK_MODE - persisted_configuration_state_e result = doReadConfiguration(getFlashAddrFirstCopy()); - - + persisted_configuration_state_e result = doReadConfiguration(firstCopyAddr); if (result != PC_OK) { efiPrintf("Reading second configuration copy"); - result = doReadConfiguration(getFlashAddrSecondCopy()); + result = doReadConfiguration(secondyCopyAddr); } if (result == CRC_FAILED) {