Add psram_check_address to check if psram variable can be used

Also fix no_flash binaries, and the tiny_psram test

Author: will-v-pi

src/rp2_common/hardware_flash/flash.c

@@ -261,7 +261,6 @@ void __no_inline_not_in_flash_func(flash_range_program)(uint32_t flash_offs, con
 //-----------------------------------------------------------------------------
 // Lower-level flash access functions
 
-#if !PICO_NO_FLASH
 // Bitbanging the chip select using IO overrides, in case RAM-resident IRQs
 // are still running, and the FIFO bottoms out. (the bootrom does the same)
 static void __no_inline_not_in_flash_func(flash_cs_force)(bool high, uint8_t cs) {
@@ -340,7 +339,6 @@ void __no_inline_not_in_flash_func(flash_do_cmd_cs)(const uint8_t *txbuf, uint8_
     flash_enable_xip_via_boot2();
     flash_restore_hardware_state(&state);
 }
-#endif
 
 // Use standard RUID command to get a unique identifier for the flash (and
 // hence the board)

src/rp2_common/hardware_psram/include/hardware/psram.h

@@ -129,6 +129,13 @@ bool psram_is_available(void);
  */
 size_t psram_get_size(void);
 
+/*! \brief Check if an address is in available PSRAM
+ *  \ingroup hardware_psram
+ *
+ * \return true if the address is in available PSRAM, false otherwise
+ */
+bool psram_check_address(void* addr);
+
 /*! \brief Detect PSRAM size
  *  \ingroup hardware_psram
  *

src/rp2_common/hardware_psram/psram.c

@@ -298,6 +298,15 @@ size_t psram_get_size(void) {
     return flash_devinfo_size_to_bytes(flash_devinfo_get_cs_size(1));
 }
 
+bool psram_check_address(void* addr) {
+    uint32_t offset = (uint32_t)addr - (XIP_BASE + flash_devinfo_size_to_bytes(FLASH_DEVINFO_SIZE_MAX));
+    if (offset < psram_get_size()) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
 #if !PICO_RUNTIME_NO_INIT_PSRAM
 void runtime_init_setup_psram(void) {
     // Setup flash_devinfo from compile definitions if it is unset

src/rp2_common/pico_standard_link/script_include/sections_psram.incl

@@ -3,14 +3,14 @@ SECTIONS
     .psram_load : {
         __psram_start__ = .;
         __psram_load_start__ = .;
-        *(.psram_initialised.*)
+        *(SORT(.psram_initialised.*))
         . = ALIGN(4);
         __psram_load_end__ = .;
     } > PSRAM AT> PSRAM_STORE
     __psram_load_source__ = LOADADDR(.psram_load);
 
     .psram_noload (NOLOAD) : {
-        *(.psram_uninitialised.*)
+        *(SORT(.psram_uninitialised.*))
         . = ALIGN(4);
         __psram_end__ = .;
     } > PSRAM

test/kitchen_sink/CMakeLists.txt

@@ -170,6 +170,7 @@ if (NOT PICO_RP2040)
     target_link_libraries(kitchen_sink_psram_tiny kitchen_sink_libs kitchen_sink_options)
     target_compile_definitions(kitchen_sink_psram_tiny PRIVATE FIXED_PSRAM_SIZE=1 TINY_PSRAM=1)
     # Override the PSRAM size to allow variables in PSRAM
+    target_compile_definitions(kitchen_sink_psram_tiny PRIVATE PICO_AUTO_DETECT_PSRAM=1)
     pico_override_psram_size(kitchen_sink_psram_tiny "(1 * 1024 * 1024)")
     pico_add_extra_outputs(kitchen_sink_psram_tiny)
     target_compile_definitions(kitchen_sink_psram_tiny PRIVATE KITCHEN_SINK_ID="psram tiny size binary")
@@ -182,7 +183,15 @@ if (NOT PICO_RP2040)
     target_compile_definitions(kitchen_sink_psram_detect PRIVATE PICO_AUTO_DETECT_PSRAM=1)
     pico_add_extra_outputs(kitchen_sink_psram_detect)
     target_compile_definitions(kitchen_sink_psram_detect PRIVATE KITCHEN_SINK_ID="psram detect size binary")
-    set_target_properties(kitchen_sink_psram_fixed PROPERTIES PICO_TEST_FAILURE_STRING "ERROR:")
+    set_target_properties(kitchen_sink_psram_detect PROPERTIES PICO_TEST_FAILURE_STRING "ERROR:")
+
+    add_executable(kitchen_sink_no_flash_psram_detect ${CMAKE_CURRENT_LIST_DIR}/kitchen_sink.c)
+    target_link_libraries(kitchen_sink_no_flash_psram_detect kitchen_sink_libs kitchen_sink_options)
+    target_compile_definitions(kitchen_sink_no_flash_psram_detect PRIVATE PICO_AUTO_DETECT_PSRAM=1)
+    pico_set_binary_type(kitchen_sink_no_flash_psram_detect no_flash)
+    pico_add_extra_outputs(kitchen_sink_no_flash_psram_detect)
+    target_compile_definitions(kitchen_sink_no_flash_psram_detect PRIVATE KITCHEN_SINK_ID="psram detect size no_flash binary")
+    set_target_properties(kitchen_sink_no_flash_psram_detect PROPERTIES PICO_TEST_FAILURE_STRING "ERROR:")
 
     add_executable(kitchen_sink_psram_flash_fixed ${CMAKE_CURRENT_LIST_DIR}/kitchen_sink.c)
     target_link_libraries(kitchen_sink_psram_flash_fixed kitchen_sink_libs kitchen_sink_options)

test/kitchen_sink/kitchen_sink.c

@@ -55,6 +55,9 @@ char __psram_uninitialised("bar") bar_psram[0x8000];
 void make_tiny_psram(void) {
     // Override flash_devinfo cs size to be tiny, so bar_psram doesn't fit in it
     flash_devinfo_set_cs_size(1, FLASH_DEVINFO_SIZE_8K);
+    // Still auto-detect CS pin, as we don't know that
+    uint8_t cs_gpios[] = PICO_AVAILABLE_CS1_GPIOS;
+    psram_detect_cs_and_size(cs_gpios, sizeof(cs_gpios));
 }
 PICO_RUNTIME_INIT_FUNC_RUNTIME(make_tiny_psram, "11000");
 #endif