Merge pull request #871 from 32blit/toolchain-2350-misc-fixes

Small collection of fixes
32blit · Nov 7, 2024 · 6055a95 · 6055a95
2 parents 349bd9a + 7551227
commit 6055a95
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/32blit-pico/CMakeLists.txt b/32blit-pico/CMakeLists.txt
@@ -72,18 +72,18 @@ else()
     set(BOARD_ID ${PICO_BOARD})
 endif()
 
-if(EXISTS ${CONFIG_PATH}/config.cmake)
-    include(${CONFIG_PATH}/config.cmake)
-    message("Using board config \"${BLIT_BOARD_NAME}\"")
-else()
-    include(${CMAKE_CURRENT_LIST_DIR}/board/pico/config.cmake)
+if(NOT EXISTS ${CONFIG_PATH}/config.cmake)
+    set(CONFIG_PATH ${CMAKE_CURRENT_LIST_DIR}/board/pico)
     if(DEFINED PICO_ADDON)
         message(WARNING "Using default config for \"${PICO_BOARD}\", add-on \"${PICO_ADDON}\"...")
     else()
         message(WARNING "Using default config for \"${PICO_BOARD}\"...")
     endif()
 endif()
 
+include(${CONFIG_PATH}/config.cmake)
+message("Using board config \"${BLIT_BOARD_NAME}\"")
+
 if(EXISTS ${CONFIG_PATH}/config.h)
     list(APPEND BLIT_BOARD_DEFINITIONS "BLIT_BOARD_CONFIG=\"${CONFIG_PATH}/config.h\"")
 endif()
@@ -179,6 +179,7 @@ function(blit_executable NAME)
     blit_executable_args(${ARGN})
 
     add_executable(${NAME} ${SOURCES})
+    target_compile_definitions(${NAME} PRIVATE PICO_EMBED_XIP_SETUP=1)
     target_link_libraries(${NAME} BlitHalPico BlitEngine)
 
     pico_enable_stdio_uart(${NAME} 1)

diff --git a/32blit-pico/main.cpp b/32blit-pico/main.cpp
@@ -17,6 +17,7 @@
 #include "input.hpp"
 #include "led.hpp"
 #include "multiplayer.hpp"
+#include "storage.hpp"
 #include "usb.hpp"
 
 #include "engine/api_private.hpp"
@@ -203,10 +204,13 @@ static void alarm_callback(uint alarm_num) {
 
 int main() {
 #if OVERCLOCK_250
+#ifndef PICO_RP2350
   // Apply a modest overvolt, default is 1.10v.
   // this is required for a stable 250MHz on some RP2040s
   vreg_set_voltage(VREG_VOLTAGE_1_20);
   sleep_ms(10);
+#endif
+
   set_sys_clock_khz(250000, false);
 #endif
 

diff --git a/32blit/engine/engine.cpp b/32blit/engine/engine.cpp
@@ -33,7 +33,7 @@ namespace blit {
 
     if(new_screen.pen_blend)
       screen.pbf = new_screen.pen_blend;
-    
+
     if(new_screen.blit_blend)
       screen.bbf = new_screen.blit_blend;
 
@@ -89,8 +89,7 @@ namespace blit {
     return ret;
   }
 
-  Surface null_surface(nullptr, PixelFormat::M, Size(0, 0));
-  Surface &screen = null_surface;
+  Surface screen(nullptr, PixelFormat::M, Size(0, 0));
 
   static const uint32_t update_rate_ms = 10;
   static uint32_t pending_update_time = 0;

diff --git a/32blit/engine/engine.hpp b/32blit/engine/engine.hpp
@@ -8,7 +8,7 @@
 namespace blit {
 
   enum   ScreenMode  { lores, hires, hires_palette };
-  extern Surface      &screen;
+  extern Surface      screen;
 
 
   extern void     (*init)             ();

diff --git a/pico.toolchain b/pico.toolchain
@@ -5,6 +5,6 @@ set(PICO_COMMON_LANG_FLAGS " -mcpu=cortex-m0plus -mthumb")
 
 include(${CMAKE_CURRENT_LIST_DIR}/pico-common.toolchain)
 
-if (NOT PICO_BOARD)
+if (NOT PICO_BOARD AND NOT PICO_ADDON)
     set(PICO_BOARD pimoroni_picosystem)
-endif()
+endif()
diff --git a/pico2.toolchain b/pico2.toolchain
@@ -7,4 +7,8 @@ if (NOT PICO_NO_CMSE)
     set(PICO_COMMON_LANG_FLAGS "${PICO_COMMON_LANG_FLAGS} -mcmse")
 endif()
 
-include(${CMAKE_CURRENT_LIST_DIR}/pico-common.toolchain)
+include(${CMAKE_CURRENT_LIST_DIR}/pico-common.toolchain)
+
+if (NOT PICO_BOARD)
+    set(PICO_BOARD pico2)
+endif()