diff options
| author | David Sidrane <david_s5@nscdg.com> | 2015-04-06 19:23:02 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-06 19:23:02 -1000 |
| commit | b0da5c7d5749f4b314b6790e929f785682dcf9ac (patch) | |
| tree | 82677e9054e576f5e0ca0be689a3e73b20edadf1 | |
| parent | 199593cd12c35e1bc0eaf2e5a0f3c33ae9367e76 (diff) | |
| parent | 9dcd6fd8000145320b5c894e2dcb8b426df19301 (diff) | |
| download | px4-firmware-b0da5c7d5749f4b314b6790e929f785682dcf9ac.tar.gz px4-firmware-b0da5c7d5749f4b314b6790e929f785682dcf9ac.tar.bz2 px4-firmware-b0da5c7d5749f4b314b6790e929f785682dcf9ac.zip | |
Merge pull request #1990 from PX4/nuttx_next_app_init_rtc_resetfix
Moved the Nuttx RTC magic test to not collide with bootloader
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index d05fe8e15..2688bbbdb 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -425,6 +425,8 @@ CONFIG_STM32_SAVE_CRASHDUMP=y CONFIG_BOARD_CRASHDUMP=y CONFIG_BOARD_RESET_ON_CRASH=y # CONFIG_STM32_HAVE_RTC_SUBSECONDS is not set +CONFIG_RTC_MAGIC_REG=1 +CONFIG_RTC_MAGIC=0xfacefeee # CONFIG_RTC_LSECLOCK is not set # CONFIG_RTC_LSICLOCK is not set CONFIG_RTC_HSECLOCK=y |