Commit 72006693 authored by Radoslaw Koppel's avatar Radoslaw Koppel Committed by Fabio Utzig
Browse files

zephyr: Fix serial recovery skipping on nrf53 



The nRF53 mcu has moved RESETREAS register
(from POWER to RESET peripheral).
This fix uses nrfx helper to select the proper register.

Signed-off-by: default avatarRadoslaw Koppel <radoslaw.koppel@nordicsemi.no>
parent dacc7d60

boot/zephyr/main.c

+3 −7
Original line number Diff line number Diff line
@@ -86,17 +86,13 @@ K_SEM_DEFINE(boot_log_sem, 1, 1); 
#endif /* defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE) */



#ifdef CONFIG_SOC_FAMILY_NRF

#include <hal/nrf_power.h>

#include <helpers/nrfx_reset_reason.h>



static inline bool boot_skip_serial_recovery()

{

#if NRF_POWER_HAS_RESETREAS

    uint32_t rr = nrf_power_resetreas_get(NRF_POWER);

    uint32_t rr = nrfx_reset_reason_get();



    return !(rr == 0 || (rr & NRF_POWER_RESETREAS_RESETPIN_MASK));

#else

    return false;

#endif

    return !(rr == 0 || (rr & NRFX_RESET_REASON_RESETPIN_MASK));

}

#else

static inline bool boot_skip_serial_recovery()

CRA Git | Maintained and supported by SUSTech CRA and CCSE