Finished RA4M2 system library

IvanRuzavin · IvanRuzavin · commit e2dcba26b707 · 2025-12-01T16:09:01.000+01:00
diff --git a/ARM/gcc_clang/cmake/renesas/delays/ra4m2.cmake b/ARM/gcc_clang/cmake/renesas/delays/ra4m2.cmake
@@ -1,3 +1,3 @@
 if(${MCU_NAME} MATCHES "^R7FA4M2AB3CFL$|^R7FA4M2AB3CFM$|^R7FA4M2AB3CFP$|^R7FA4M2AB3CNE$|^R7FA4M2AC3CFL$|^R7FA4M2AC3CFM$|^R7FA4M2AC3CFP$|^R7FA4M2AC3CNE$|^R7FA4M2AD3CFL$|^R7FA4M2AD3CFM$|^R7FA4M2AD3CFP$|^R7FA4M2AD3CNE$")
-    list(APPEND local_list_macros "getClockValue(_clock) (_clock/1000UL/9)")
+    list(APPEND local_list_macros "getClockValue(_clock) (_clock/1000UL/3)")
 endif()
diff --git a/ARM/gcc_clang/system/src/renesas/ra4m2/init_clock.c b/ARM/gcc_clang/system/src/renesas/ra4m2/init_clock.c
@@ -42,7 +42,6 @@
 #include "core_header.h"
 #include "mcu.h"
 
-
 extern void * __Vectors[];
 
 typedef struct
@@ -346,39 +345,6 @@ const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENT
 
 // -----------------------------------------------------------------------------------------
 
-/***********************************************************************
- * ID Code Configuration for On-Chip Flash Protection
- * This section places the user-defined 128-bit ID code into a special
- * memory section. These values can be used to lock/unlock the flash.
- *
- * If BSP_FEATURE_BSP_OSIS_PADDING is enabled, each 32-bit word is
- * followed by 0xFFFFFFFF as padding.
- ***********************************************************************/
-#if BSP_FEATURE_FLASH_SUPPORTS_ID_CODE == 1
-
-/** ID code values (4 x 32-bit, optionally padded) */
-BSP_DONT_REMOVE static const uint32_t g_bsp_id_codes[] BSP_PLACE_IN_SECTION(BSP_SECTION_ID_CODE) =
-{
-    BSP_CFG_ID_CODE_LONG_1,
-    #if BSP_FEATURE_BSP_OSIS_PADDING
-    0xFFFFFFFFU,  // Padding after ID code 1
-    #endif
-
-    BSP_CFG_ID_CODE_LONG_2,
-    #if BSP_FEATURE_BSP_OSIS_PADDING
-    0xFFFFFFFFU,  // Padding after ID code 2
-    #endif
-
-    BSP_CFG_ID_CODE_LONG_3,
-    #if BSP_FEATURE_BSP_OSIS_PADDING
-    0xFFFFFFFFU,  // Padding after ID code 3
-    #endif
-
-    BSP_CFG_ID_CODE_LONG_4
-};
-
-#endif  // BSP_FEATURE_FLASH_SUPPORTS_ID_CODE
-
 /***********************************************************************
  * Option Function Select (OFS) Settings
  ***********************************************************************/
@@ -591,18 +557,18 @@ void SystemInit(void)
     // Enable MSP monitoring
     R_MPU_SPMON->SP[0].CTL = 1U;
 
-    memcpy(
-        &__ram_from_flash$$Base,
-        &__ram_from_flash$$Load,
-        (uint32_t)&__ram_from_flash$$Limit - (uint32_t)&__ram_from_flash$$Base
-    );
-
     memset(
         &__ram_zero$$Base,
         0,
         (uint32_t)&__ram_zero$$Limit - (uint32_t)&__ram_zero$$Base
     );
 
+    memcpy(
+        &__ram_from_flash$$Base,
+        &__ram_from_flash$$Load,
+        (uint32_t)&__ram_from_flash$$Limit - (uint32_t)&__ram_from_flash$$Base
+    );
+
     int32_t count = __init_array_end - __init_array_start;
     for (int32_t i = 0; i < count; i++)
     {
@@ -699,9 +665,7 @@ static void system_clock_configuration() {
 
     Delay_1ms();
 
-    if ( 80000 < FOSC_KHZ_VALUE && 120000 >= FOSC_KHZ_VALUE ) {
-        R_FCACHE->FLWT = 2; // 2 waits
-    } else if ( 40000 < FOSC_KHZ_VALUE ) {
+    if ( 50000 < FOSC_KHZ_VALUE ) {
         R_FCACHE->FLWT = 1; // 1 wait
     } else {
         R_FCACHE->FLWT = 0; // 0 waits
@@ -719,4 +683,4 @@ static void system_clock_configuration() {
 
     // Lock write protection register
     R_SYSTEM->PRCR = (uint16_t) BSP_PRV_PRCR_LOCK;
-}
+}
