Fix compile issue after merging.

Author: gangheivt

src/fw/drivers/sf32lb/stubs/rtc.c

@@ -59,6 +59,10 @@ RtcTicks rtc_get_ticks(void) {
   // TODO
   RtcTicks rtc_interval_ticks = 1;
 
+  if (ints_enabled) {
+    __enable_irq();
+  }
+
   return s_coarse_ticks + rtc_interval_ticks;
 }
 

src/fw/drivers/task_watchdog.c

@@ -82,6 +82,9 @@ static uint8_t s_ticks_since_successful_feed = 0;
 #if MICRO_FAMILY_NRF5
 #define WATCHDOG_FREERTOS_IRQn        EGU5_SWI5_IRQn
 #define WATCHDOG_FREERTOS_IRQHandler  EGU5_SWI5_IRQHandler
+#elif MICRO_FAMILY_SF32LB
+#define WATCHDOG_FREERTOS_IRQn        2
+#define WATCHDOG_FREERTOS_IRQHandler  NMI_Handler2 
 #else
 #define WATCHDOG_FREERTOS_IRQn        CAN2_SCE_IRQn
 #define WATCHDOG_FREERTOS_IRQHandler  CAN2_SCE_IRQHandler
@@ -337,6 +340,7 @@ void task_watchdog_init(void) {
   // configMAX_SYSCALL_INTERRUPT_PRIORITY or lower, it can at least call FreeRTOS ISR functions.
 #if MICRO_FAMILY_NRF5
   NVIC_SetPriority(WATCHDOG_FREERTOS_IRQn, configMAX_SYSCALL_INTERRUPT_PRIORITY);
+#elif MICRO_FAMILY_SF32LB
 #else
   NVIC_InitStructure.NVIC_IRQChannel = WATCHDOG_FREERTOS_IRQn;
   NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = configMAX_SYSCALL_INTERRUPT_PRIORITY >> 4;

src/fw/main.c

@@ -393,6 +393,7 @@ static NOINLINE void prv_main_task_init(void) {
   static McuRebootReason s_mcu_reboot_reason;
   s_mcu_reboot_reason = watchdog_clear_reset_flag();
 
+  __asm("B .");
 #if PULSE_EVERYWHERE
   pulse_init();
   pulse_logging_init();

src/fw/system/bootbits.c

@@ -30,7 +30,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 
-#if MICRO_FAMILY_NRF5 || MICRO_FAMILY_SF32LB
+#if MICRO_FAMILY_NRF5 
 
 static uint32_t __attribute__((section(".retained"))) retained[256 / 4];
 
@@ -99,7 +99,51 @@ uint32_t boot_version_read(void) {
   return retained_read(BOOTLOADER_VERSION_REGISTER);
 }
 
-#else /* !nrf5 */
+#elif MICRO_FAMILY_SF32LB
+
+static uint32_t _bootbits;
+
+void boot_bit_init(void) {
+  _bootbits = BOOT_BIT_INITIALIZED;
+}
+
+void boot_bit_set(BootBitValue bit) {
+  _bootbits |= bit;
+}
+
+void boot_bit_clear(BootBitValue bit) {
+  _bootbits &= ~bit;
+}
+
+bool boot_bit_test(BootBitValue bit) {
+  return _bootbits & bit;
+}
+
+void boot_bit_dump(void) {
+  PBL_LOG(LOG_LEVEL_DEBUG, "0x%"PRIx32, _bootbits);
+}
+
+uint32_t boot_bits_get(void) {
+  return _bootbits;
+}
+
+void command_boot_bits_get(void) {
+  char buffer[32];
+  dbgserial_putstr_fmt(buffer, sizeof(buffer), "bootbits: 0x%"PRIu32, boot_bits_get());
+}
+
+void boot_version_write(void) {
+  if (boot_version_read() == TINTIN_METADATA.version_timestamp) {
+    return;
+  }
+  /* RTC_WriteBackupRegister(BOOTLOADER_VERSION_REGISTER, TINTIN_METADATA.version_timestamp); */
+}
+
+uint32_t boot_version_read(void) {
+  return 0xABCD1234;
+}
+
+#else
 
 void boot_bit_init(void) {
   rtc_init();