Fix no_flash build

Move default time_critical section, and store correctly

Author: will-v-pi

src/rp2_common/pico_crt0/rp2040/memmap_no_flash.ld

@@ -51,7 +51,6 @@ SECTIONS
         __embedded_block_end = .;
         . = ALIGN(256);
         KEEP (*(.vectors))
-        *(.time_critical*)
         *(.text*)
         . = ALIGN(4);
         *(.init)
@@ -108,6 +107,9 @@ SECTIONS
     .data : {
         __data_start__ = .;
         *(vtable)
+
+        *(.time_critical*)
+
         *(.data*)
 
         . = ALIGN(4);

src/rp2_common/pico_crt0/rp2040/memmap_sram.template.ld

@@ -51,7 +51,6 @@ SECTIONS
         __embedded_block_end = .;
         . = ALIGN(256);
         KEEP (*(.vectors))
-        *(.time_critical*)
         *(.text*)
         . = ALIGN(4);
         *(.init)
@@ -108,6 +107,9 @@ SECTIONS
     .data : {
         __data_start__ = .;
         *(vtable)
+
+        *(.time_critical*)
+
         *(.data*)
 
         . = ALIGN(4);

src/rp2_common/pico_standard_link/CMakeLists.txt

@@ -168,21 +168,31 @@ if (NOT TARGET pico_standard_link)
             pico_set_modified_binary_type(${TARGET} ${TYPE} RAM ${XIP_SRAM_BASE} ${XIP_SRAM_END}-${XIP_SRAM_BASE}-4k SCRATCH_X ${XIP_SRAM_END}-4k 2k SCRATCH_Y ${XIP_SRAM_END}-2k 2k)
             return()
         elseif (TYPE STREQUAL "no_flash_using_xip_ram" OR TYPE STREQUAL "copy_to_ram_using_xip_ram")
-            function(pico_internal_add_xip_text_section)
+            function(pico_internal_add_xip_text_section STORE_AT)
                 set(ADDITIONAL_PRE_DATA "set(ADDITIONAL_PRE_DATA \"
                 .xip_text : {
                     __xip_ram_text_start__ = .;
                     . = ALIGN(4);
                     *(.time_critical.text*)
                     . = ALIGN(4);
                     __xip_ram_text_end__ = .;
-                } > XIP_RAM AT> FLASH
+                } > XIP_RAM ${STORE_AT}
                 __xip_ram_text_source__ = LOADADDR(.xip_text);\")" PARENT_SCOPE)
 
                 pico_get_addressmap_value(XIP_SRAM_BASE)
                 pico_get_addressmap_value(XIP_SRAM_END)
                 set(ADDITIONAL_MEMORY "set(ADDITIONAL_MEMORY \"    XIP_RAM(rwx) : ORIGIN = ${XIP_SRAM_BASE}, LENGTH = ${XIP_SRAM_END} - ${XIP_SRAM_BASE}\")" PARENT_SCOPE)
             endfunction()
+            function(pico_internal_add_xip_text_section_no_flash)
+                pico_internal_add_xip_text_section("")
+                set(ADDITIONAL_PRE_DATA ${ADDITIONAL_PRE_DATA} PARENT_SCOPE)
+                set(ADDITIONAL_MEMORY ${ADDITIONAL_MEMORY} PARENT_SCOPE)
+            endfunction()
+            function(pico_internal_add_xip_text_section_copy_to_ram)
+                pico_internal_add_xip_text_section("AT> FLASH")
+                set(ADDITIONAL_PRE_DATA ${ADDITIONAL_PRE_DATA} PARENT_SCOPE)
+                set(ADDITIONAL_MEMORY ${ADDITIONAL_MEMORY} PARENT_SCOPE)
+            endfunction()
             target_compile_definitions(${TARGET} PRIVATE PICO_DATA_COPY_EXTRA_SECTIONS_FILE="data_cpy_xip_text.S" PICO_USE_XIP_CACHE_AS_RAM=1)
             file(CONFIGURE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/data_cpy_xip_text.S CONTENT "
 .word __xip_ram_text_source__
@@ -191,9 +201,9 @@ if (NOT TARGET pico_standard_link)
 " @ONLY)
             target_include_directories(${TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
             if (TYPE STREQUAL "no_flash_using_xip_ram")
-                pico_set_modified_binary_type(${TARGET} sram EXTRAS pico_internal_add_xip_text_section)
+                pico_set_modified_binary_type(${TARGET} sram EXTRAS pico_internal_add_xip_text_section_no_flash)
             elseif (TYPE STREQUAL "copy_to_ram_using_xip_ram")
-                pico_set_modified_binary_type(${TARGET} copy_flash_sram EXTRAS pico_internal_add_xip_text_section)
+                pico_set_modified_binary_type(${TARGET} copy_flash_sram EXTRAS pico_internal_add_xip_text_section_copy_to_ram)
             endif()
             return()
         endif()

test/pico_xip_sram_test/CMakeLists.txt

@@ -13,4 +13,15 @@ if (NOT PICO_RP2040)
     target_link_libraries(pico_critical_xip_sram_test PRIVATE hardware_riscv_platform_timer)
 endif()
 pico_set_binary_type(pico_critical_xip_sram_test copy_to_ram_using_xip_ram)
+pico_enable_stdio_usb(pico_critical_xip_sram_test 1) # test with USB as that invokes flash functions
 pico_add_extra_outputs(pico_critical_xip_sram_test)
+
+# Use XIP SRAM for time critical functions (no_flash build)
+add_executable(pico_critical_xip_sram_test_no_flash pico_critical_xip_sram_test.c)
+target_link_libraries(pico_critical_xip_sram_test_no_flash PRIVATE pico_stdlib pico_multicore hardware_dma)
+if (NOT PICO_RP2040)
+    target_link_libraries(pico_critical_xip_sram_test_no_flash PRIVATE hardware_riscv_platform_timer)
+endif()
+pico_set_binary_type(pico_critical_xip_sram_test_no_flash no_flash_using_xip_ram)
+pico_enable_stdio_usb(pico_critical_xip_sram_test 1)
+pico_add_extra_outputs(pico_critical_xip_sram_test_no_flash)