Move section_xip_ram and sections_psram before data in linker scripts

Initialised data must come before uninitialised, so section_xip_ram must come before section_persistent_data

Neither of these place anything in SRAM for default binaries, so this doesn't change the ram_vector_table location

Author: will-v-pi

src/rp2_common/pico_standard_link/script_include/sections_copy_to_ram.incl

@@ -3,6 +3,8 @@
 INCLUDE "sections_copy_to_ram_text.incl"
 INCLUDE "section_generated_post_text.incl"
 INCLUDE "section_extra_post_text.incl"
+INCLUDE "sections_psram.incl"
+INCLUDE "section_xip_ram.incl"
 INCLUDE "sections_copy_to_ram_data.incl"
 INCLUDE "section_generated_post_data.incl"
 INCLUDE "section_extra_post_data.incl"
@@ -11,8 +13,6 @@ INCLUDE "sections_scratch.incl"
 INCLUDE "section_generated_post_scratch.incl"
 INCLUDE "section_extra_post_scratch.incl"
 INCLUDE "sections_stack.incl"
-INCLUDE "sections_psram.incl"
-INCLUDE "section_xip_ram.incl"
 INCLUDE "section_flash_end.incl"
 INCLUDE "section_end.incl"
 INCLUDE "section_generated_post_end.incl"

src/rp2_common/pico_standard_link/script_include/sections_default.incl

@@ -3,6 +3,8 @@
 INCLUDE "sections_default_text.incl"
 INCLUDE "section_generated_post_text.incl"
 INCLUDE "section_extra_post_text.incl"
+INCLUDE "sections_psram.incl"
+INCLUDE "section_xip_ram.incl"
 INCLUDE "sections_default_data.incl"
 INCLUDE "section_generated_post_data.incl"
 INCLUDE "section_extra_post_data.incl"
@@ -11,8 +13,6 @@ INCLUDE "sections_scratch.incl"
 INCLUDE "section_generated_post_scratch.incl"
 INCLUDE "section_extra_post_scratch.incl"
 INCLUDE "sections_stack.incl"
-INCLUDE "sections_psram.incl"
-INCLUDE "section_xip_ram.incl"
 INCLUDE "section_flash_end.incl"
 INCLUDE "section_end.incl"
 INCLUDE "section_generated_post_end.incl"

src/rp2_common/pico_standard_link/script_include/sections_no_flash.incl

@@ -3,6 +3,8 @@
 INCLUDE "sections_no_flash_text.incl"
 INCLUDE "section_generated_post_text.incl"
 INCLUDE "section_extra_post_text.incl"
+INCLUDE "sections_psram.incl"
+INCLUDE "section_xip_ram.incl"
 INCLUDE "sections_no_flash_data.incl"
 INCLUDE "section_generated_post_data.incl"
 INCLUDE "section_extra_post_data.incl"
@@ -11,8 +13,6 @@ INCLUDE "sections_scratch.incl"
 INCLUDE "section_generated_post_scratch.incl"
 INCLUDE "section_extra_post_scratch.incl"
 INCLUDE "sections_stack.incl"
-INCLUDE "sections_psram.incl"
-INCLUDE "section_xip_ram.incl"
 INCLUDE "section_end.incl"
 INCLUDE "section_generated_post_end.incl"
 INCLUDE "section_extra_post_end.incl"

test/pico_low_power_test/CMakeLists.txt

@@ -52,7 +52,7 @@ if (NOT PICO_RP2040)
                 pico_encrypt_binary(low_power_test_timers_encrypted_xip_sram ${PICO_SDK_PATH}/tools/example_keys/privateaes.bin ${PICO_SDK_PATH}/tools/example_keys/ivsalt.bin EMBED)
                 pico_set_persistent_data_loc(low_power_test_timers_encrypted_xip_sram xip_ram)
                 # Also check encrypting with code in xip_sram
-                pico_use_xip_sram_for_time_critical(low_power_test_timers_encrypted_xip_sram)
+                pico_set_time_critical_placement(low_power_test_timers_encrypted_xip_sram xip_ram)
                 set_target_properties(low_power_test_timers_encrypted_xip_sram PROPERTIES PICO_TEST_TIMEOUT 35)
                 set_target_properties(low_power_test_timers_encrypted_xip_sram PROPERTIES PICO_TEST_FAILURE_STRING "ERROR:")
                 set_target_properties(low_power_test_timers_encrypted_xip_sram PROPERTIES PICO_TEST_BUDDY_FILE external_sleep_timer.elf)

test/pico_xip_sram_test/CMakeLists.txt

@@ -105,7 +105,7 @@ if (NOT PICO_RP2040 AND NOT PICO_C_COMPILER_IS_CLANG)
         target_link_libraries(pico_critical_xip_sram_test_packaged PRIVATE hardware_riscv_platform_timer)
     endif()
     pico_set_binary_type(pico_critical_xip_sram_test_packaged no_flash)
-    pico_use_xip_sram_for_time_critical(pico_critical_xip_sram_test_packaged)
+    pico_set_time_critical_placement(pico_critical_xip_sram_test_packaged xip_ram)
     pico_package_uf2_output(pico_critical_xip_sram_test_packaged)
     pico_add_extra_outputs(pico_critical_xip_sram_test_packaged)
 endif()