Fix board setup of obelix_bb, disable LXT32K.

Author: gangheivt

platform/wscript

@@ -47,6 +47,10 @@ def is_asterix(ctx):
 def is_obelix(ctx):
     return ctx.get_board() in ('obelix', 'obelix_bb')    
 
+@conf
+def is_obelix_bb(ctx):
+    return ctx.get_board() in ('obelix_bb')    
+
 @conf
 def get_platform_name(ctx):
     if is_tintin(ctx):

src/fw/board/boards/board_em_lb525.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+#include "rtconfig.h"
 #include "board/board.h"
 #include "drivers/sf32lb/uart_definitions.h"
 #include "board_em_lb525.h"
@@ -167,6 +167,18 @@ uint32_t BSP_GetOtpBase(void)
     return MPI2_MEM_BASE;
 }
 
+#define HXT_DELAY_EXP_VAL 1000
+static void LRC_init(void)
+{
+    HAL_PMU_RC10Kconfig();
+
+    HAL_RC_CAL_update_reference_cycle_on_48M(LXT_LP_CYCLE);
+    uint32_t ref_cnt = HAL_RC_CAL_get_reference_cycle_on_48M();
+    uint32_t cycle_t = (uint32_t)ref_cnt / (48 * LXT_LP_CYCLE);
+
+    HAL_PMU_SET_HXT3_RDY_DELAY((HXT_DELAY_EXP_VAL / cycle_t + 1));
+}
+
 void HAL_PreInit(void)
 {
     // __asm("B .");
@@ -192,13 +204,13 @@ void HAL_PreInit(void)
         HAL_PMU_LpCLockSelect(PMU_LPCLK_RC32);
 
         HAL_PMU_EnableDLL(1);
-
+#ifndef LXT_DISABLE 
         HAL_PMU_EnableXTAL32();
         if (HAL_PMU_LXTReady() != HAL_OK)
             HAL_ASSERT(0);
         // RTC/GTIME/LPTIME Using same low power clock source
         HAL_RTC_ENABLE_LXT();
-
+#endif  
         {
             uint8_t is_enable_lxt = 1;
             uint32_t wdt_staus = 0xFF;
@@ -216,7 +228,9 @@ void HAL_PreInit(void)
 
         HAL_RCC_LCPU_ClockSelect(RCC_CLK_MOD_LP_PERI, RCC_CLK_PERI_HXT48);
 
-        HAL_HPAON_CANCEL_LP_ACTIVE_REQUEST();
+        HAL_HPAON_CANCEL_LP_ACTIVE_REQUEST();        
+        if (HAL_LXT_DISABLED())
+            LRC_init();
     }
 
     HAL_RCC_HCPU_ConfigHCLK(240);

src/fw/board/boards/board_obelix_bb.c

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+#include "rtconfig.h"
 #include "board/board.h"
 #include "drivers/sf32lb/uart_definitions.h"
 #include "drivers/i2c.h"
@@ -251,6 +251,19 @@ uint32_t BSP_GetOtpBase(void)
     return MPI2_MEM_BASE;
 }
 
+
+#define HXT_DELAY_EXP_VAL 1000
+static void LRC_init(void)
+{
+    HAL_PMU_RC10Kconfig();
+
+    HAL_RC_CAL_update_reference_cycle_on_48M(LXT_LP_CYCLE);
+    uint32_t ref_cnt = HAL_RC_CAL_get_reference_cycle_on_48M();
+    uint32_t cycle_t = (uint32_t)ref_cnt / (48 * LXT_LP_CYCLE);
+
+    HAL_PMU_SET_HXT3_RDY_DELAY((HXT_DELAY_EXP_VAL / cycle_t + 1));
+}
+
 void HAL_PreInit(void)
 {
     // __asm("B .");
@@ -277,12 +290,14 @@ void HAL_PreInit(void)
 
         HAL_PMU_EnableDLL(1);
 
+#ifndef LXT_DISABLE 
         HAL_PMU_EnableXTAL32();
         if (HAL_PMU_LXTReady() != HAL_OK)
             HAL_ASSERT(0);
         // RTC/GTIME/LPTIME Using same low power clock source
         HAL_RTC_ENABLE_LXT();
-
+#endif
+#if 0
         {
             uint8_t is_enable_lxt = 1;
             uint32_t wdt_staus = 0xFF;
@@ -296,11 +311,14 @@ void HAL_PreInit(void)
             HAL_LCPU_CONFIG_set(HAL_LCPU_CONFIG_BT_RC_CAL_IN_L, &is_lcpu_rccal, 1);
             HAL_PMU_SetWdt((uint32_t)hwp_wdt2);   // Add reboot cause for watchdog2
         }
-
+#endif
 
         HAL_RCC_LCPU_ClockSelect(RCC_CLK_MOD_LP_PERI, RCC_CLK_PERI_HXT48);
 
         HAL_HPAON_CANCEL_LP_ACTIVE_REQUEST();
+        if (HAL_LXT_DISABLED())
+            LRC_init();
+        
     }
 
     HAL_RCC_HCPU_ConfigHCLK(240);

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

@@ -1,3 +1,4 @@
+#include "rtconfig.h"
 #include "drivers/rtc.h"
 #include "drivers/rtc_private.h"
 #include "drivers/stm32f2/rtc_calibration.h"
@@ -32,7 +33,7 @@ static RTC_HandleTypeDef RTC_Handler = {
 
 typedef uint32_t RtcIntervalTicks;
 
-static const unsigned int LSE_FREQUENCY_HZ = 32768;
+//static const unsigned int LSE_FREQUENCY_HZ = 32768;
 #define SECONDS_IN_A_DAY (60 * 60 * 24)
 #define TICKS_IN_AN_INTERVAL SECONDS_IN_A_DAY
 
@@ -157,12 +158,47 @@ static void initialize_fast_mode_state(void) {
   //save_rtc_time_state(0);
 }
 
+uint32_t rtc_get_lpcycle()
+{
+    uint32_t value;
+#ifdef  BF0_HCPU
+    value = HAL_Get_backup(RTC_BACKUP_LPCYCLE_AVE);
+    if (value == 0)
+        value = 1200000;
+    value += BSP_RTC_PPM;   // Calibrate in initial with 8 cycle
+    HAL_Set_backup(RTC_BACKUP_LPCYCLE, (uint32_t)value);
+#else
+    value = HAL_Get_backup(RTC_BACKUP_LPCYCLE);
+#endif
+    return value;
+}
+
+static uint32_t soft_rc10_backup = 0;
+static uint16_t rc10_freq_khz;
+
+void drv_set_soft_rc10_backup(uint32_t backup)
+{
+    soft_rc10_backup = backup;
+    /* RC10K freq_khz = 48000 * LXT_LP_CYCLE / v; */
+    rc10_freq_khz = (uint16_t)(48000UL * LXT_LP_CYCLE / backup);
+}
+
+void rtc_rc10_calculate_div(RTC_HandleTypeDef *hdl, uint32_t value)
+{
+    hdl->Init.DivB = RC10K_SUB_SEC_DIVB;
+
+    // 1 seconds has total 1/(x/(48*8))/256=1.5M/x cycles, times 2^14 for DIVA
+    uint32_t divider = RTC_Handler.Init.DivB * value;
+    value = ((uint64_t)48000000 * LXT_LP_CYCLE * (1 << 14) + (divider >> 1)) / divider;
+    hdl->Init.DivAInt = (uint32_t)(value >> 14);
+    hdl->Init.DivAFrac = (uint32_t)(value & ((1 << 14) - 1));
+}
+
 void rtc_init(void) {
   periph_config_acquire_lock();
   rtc_enable_backup_regs();
-#ifdef LXT_DISABLE
-#error "RTC LXT is disabled, but RTC init requires it to be enabled"
-#endif
+
+#ifndef LXT_DISABLE
 #ifdef SF32LB52X
   HAL_PMU_EnableXTAL32();
   if (HAL_PMU_LXTReady() != HAL_OK)
@@ -174,11 +210,23 @@ void rtc_init(void) {
     WTF;
   }
   HAL_RTC_ENABLE_LXT();
-  
+#endif
+
   RTC_Handler.Init.DivAInt = 0x80;
   RTC_Handler.Init.DivAFrac = 0x0;
   RTC_Handler.Init.DivB = 0x100;
   uint32_t wakesrc = RTC_INIT_NORMAL;
+
+#ifdef LXT_DISABLE
+  {
+    uint64_t value = 0;
+    value = rtc_get_lpcycle();
+    drv_set_soft_rc10_backup((uint32_t)value);
+    if (value)
+      rtc_rc10_calculate_div(&RTC_Handler, value);
+  }
+#endif
+
   if (HAL_RTC_Init(&RTC_Handler, wakesrc) != HAL_OK)
   {
     WTF;

third_party/hal_sifli/wscript

@@ -5,7 +5,8 @@ def configure(conf):
     conf.env.append_unique('DEFINES', 'HAL_NMI_HANLDER_OVERRIDED')
     if conf.env.MICRO_FAMILY == 'SF32LB':
         conf.env.append_unique('DEFINES', 'SF32LB52X')
-
+    if conf.is_obelix_bb():
+        conf.env.append_unique('DEFINES', 'LXT_DISABLE=1')
 
 def build(bld):
     if bld.env.MICRO_FAMILY == 'SF32LB':