aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sidrane <david_s5@nscdg.com>2015-04-06 14:04:52 -1000
committerDavid Sidrane <david_s5@nscdg.com>2015-04-06 14:04:52 -1000
commit9dcd6fd8000145320b5c894e2dcb8b426df19301 (patch)
tree82677e9054e576f5e0ca0be689a3e73b20edadf1
parenta2e55f0248ad42b5706bb2ebc19055f842df0477 (diff)
downloadpx4-firmware-9dcd6fd8000145320b5c894e2dcb8b426df19301.tar.gz
px4-firmware-9dcd6fd8000145320b5c894e2dcb8b426df19301.tar.bz2
px4-firmware-9dcd6fd8000145320b5c894e2dcb8b426df19301.zip
Moved the Nuttx RTC magic test to not colide with bootloader
m---------NuttX0
-rw-r--r--nuttx-configs/px4fmu-v2/nsh/defconfig2
2 files changed, 2 insertions, 0 deletions
diff --git a/NuttX b/NuttX
-Subproject 5724bb8a06a8ffb87dc07fe1f2d9bd2f3c14c8b
+Subproject 76cf23616b1eb151f04ffda19b375ede65639a5
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