pico: rework core1 enable

The only remaining use of DISPLAY_SCANVIDEO
32blit · Feb 23, 2023 · 8c4cc3c · 8c4cc3c
1 parent 224ce74
commit 8c4cc3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/32blit-pico/CMakeLists.txt b/32blit-pico/CMakeLists.txt
@@ -93,6 +93,7 @@ endif()
 
 if(BLIT_DISPLAY_DRIVER STREQUAL "scanvideo")
     set(BLIT_REQUIRE_PICO_EXTRAS TRUE)
+    set(BLIT_ENABLE_CORE1 TRUE)
     list(APPEND BLIT_BOARD_LIBRARIES pico_scanvideo_dpi)
 elseif(BLIT_DISPLAY_DRIVER STREQUAL "st7789")
     list(APPEND BLIT_BOARD_DEFINITIONS DISPLAY_ST7789) # config defaults use this, also some games are using it for picosystem detection
@@ -116,6 +117,10 @@ target_sources(BlitHalPico INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}/input_${BLIT_INPUT_DRIVER}.cpp
 )
 
+if(BLIT_ENABLE_CORE1)
+    list(APPEND BLIT_BOARD_DEFINITIONS ENABLE_CORE1)
+endif()
+
 target_compile_definitions(BlitHalPico INTERFACE ${BLIT_BOARD_DEFINITIONS})
 target_link_libraries(BlitHalPico INTERFACE ${BLIT_BOARD_LIBRARIES})
 

diff --git a/32blit-pico/board/vgaboard/config.cmake b/32blit-pico/board/vgaboard/config.cmake
@@ -3,7 +3,6 @@ set(BLIT_BOARD_NAME "VGA Board")
 set(BLIT_BOARD_DEFINITIONS
     PICO_SCANVIDEO_PLANE1_VARIABLE_FRAGMENT_DMA=1
     PICO_SCANVIDEO_MAX_SCANLINE_BUFFER_WORDS=12
-    DISPLAY_SCANVIDEO
 )
 
 blit_driver(audio i2s)

diff --git a/32blit-pico/main.cpp b/32blit-pico/main.cpp
@@ -199,7 +199,7 @@ int main() {
   init_fs();
   init_usb();
 
-#if defined(DISPLAY_SCANVIDEO)
+#if defined(ENABLE_CORE1)
   multicore_launch_core1(core1_main);
 #endif