Pico loader

.github/workflows/cmake.yml

@@ -41,6 +41,14 @@ jobs:
             apt-packages: ccache gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib pipx python3-requests
 
           - os: ubuntu-22.04
+            pico-sdk: true
+            name: PicoSystem (.blit)
+            cache-key: picosystem-bl
+            release-suffix: PicoSystem-blit
+            cmake-args: -D32BLIT_DIR=$GITHUB_WORKSPACE -DPICO_SDK_PATH=$GITHUB_WORKSPACE/pico-sdk -DPICO_BOARD=pimoroni_picosystem -DBLIT_EXECUTABLE_PICO_BLIT=1 -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+            apt-packages: ccache gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib python3-setuptools
+
+          - os: ubuntu-20.04
             pico-sdk: true
             name: PicoVision
             cache-key: picovision

32blit-config.cmake

@@ -75,30 +75,68 @@ if (NOT DEFINED BLIT_ONCE)
 	function(blit_executable_args)
 		set(SOURCES)
 
+		# enable one of the pico builds if neither set
+		if(NOT BLIT_EXECUTABLE_PICO_STANDALONE_UF2 AND NOT BLIT_EXECUTABLE_PICO_BLIT)
+			set(BLIT_EXECUTABLE_PICO_STANDALONE_UF2 TRUE)
+		endif()
+
+		# global overrides
 		if(DEFINED BLIT_EXECUTABLE_INTERNAL_FLASH)
 			set(INTERNAL_FLASH ${BLIT_EXECUTABLE_INTERNAL_FLASH})
 		else()
 			set(INTERNAL_FLASH FALSE)
 		endif()
 
+		if(DEFINED BLIT_EXECUTABLE_PICO_STANDALONE_UF2)
+			set(PICO_STANDALONE_UF2 ${BLIT_EXECUTABLE_PICO_STANDALONE_UF2})
+		else()
+			set(PICO_STANDALONE_UF2 FALSE)
+		endif()
+
+		if(DEFINED BLIT_EXECUTABLE_PICO_BLIT)
+			set(PICO_BLIT ${BLIT_EXECUTABLE_PICO_BLIT})
+		else()
+			set(PICO_BLIT FALSE)
+		endif()
+
+		if(DEFINED BLIT_EXECUTABLE_PICO_BLIT_OFFSET_KB)
+			set(PICO_BLIT_OFFSET_KB ${BLIT_EXECUTABLE_PICO_BLIT_OFFSET_KB})
+		endif()
+
 		foreach(arg IN LISTS ARGN)
 			if(arg STREQUAL "INTERNAL_FLASH")
 				set(${arg} TRUE)
+			elseif(arg STREQUAL "PICO_STANDALONE_UF2")
+				set(${arg} TRUE)
+				set(PICO_BLIT FALSE) # can't build both
+			elseif(arg STREQUAL "PICO_BLIT")
+				set(${arg} TRUE)
+				set(PICO_STANDALONE_UF2 FALSE)
+			# args with value
+			elseif(arg STREQUAL "PICO_BLIT_OFFSET_KB")
+				set(prev_arg ${arg})
+			# value for args with one
+			elseif(prev_arg STREQUAL "PICO_BLIT_OFFSET_KB")
+				set(${prev_arg} ${arg})
+				unset(prev_arg)
 			else()
 				list(APPEND SOURCES ${arg})
 			endif()
 		endforeach()
 
 		set(SOURCES ${SOURCES} PARENT_SCOPE)
 		set(INTERNAL_FLASH ${INTERNAL_FLASH} PARENT_SCOPE)
+		set(PICO_STANDALONE_UF2 ${PICO_STANDALONE_UF2} PARENT_SCOPE)
+		set(PICO_BLIT ${PICO_BLIT} PARENT_SCOPE)
+		set(PICO_BLIT_OFFSET_KB ${PICO_BLIT_OFFSET_KB} PARENT_SCOPE)
 	endfunction()
 
 	if (32BLIT_HW)
 		set(FLASH_PORT "AUTO" CACHE STRING "Port to use for flash")
 
 		include(${CMAKE_CURRENT_LIST_DIR}/32blit-stm32/executable.cmake)
 	elseif(PICO_SDK_PATH)
-		add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/32blit-pico 32blit-pico)
+		include(${CMAKE_CURRENT_LIST_DIR}/32blit-pico/executable.cmake)
 	else()
 		add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/32blit-sdl 32blit-sdl)
 	endif()

32blit-pico/CMakeLists.txt

@@ -1,44 +1,24 @@
-cmake_policy(SET CMP0079 NEW) # target_link_libraries() allows use with targets in other directories.
-
-set(CMAKE_C_STANDARD 11)
-
-# Initialise the Pico SDK
-set(PICO_BOARD_HEADER_DIRS ${CMAKE_CURRENT_LIST_DIR}/board)
-include (pico_sdk_import.cmake)
-
-set(32BLIT_PICO 1 PARENT_SCOPE)
+if(TARGET BlitHalPico)
+    return()
+endif()
 
 # prevent find_package errors in pico_add_uf2_output later
 set(PICO_SDK_VERSION_MAJOR ${PICO_SDK_VERSION_MAJOR} PARENT_SCOPE)
 set(PICO_SDK_VERSION_MINOR ${PICO_SDK_VERSION_MINOR} PARENT_SCOPE)
 set(PICO_SDK_VERSION_REVISION ${PICO_SDK_VERSION_REVISION} PARENT_SCOPE)
 
-# make sure BlitEngine is built with the right exception flags
-target_link_libraries(BlitEngine PUBLIC pico_cxx_options pico_base_headers)
-
-# also enable function/data sectons
-target_compile_options(BlitEngine PRIVATE -ffunction-sections -fdata-sections)
-
 add_subdirectory(../32blit-shared ../32blit-shared)
 
-# driver helper
-# can override driver choice by pre-setting BLIT_x_DRIVER
-function(blit_driver DRV NAME)
-    set(var BLIT_${DRV}_DRIVER)
-    string(TOUPPER ${var} var)
-
-    if(NOT ${var})
-        set(${var} ${NAME} PARENT_SCOPE)
-    endif()
-endfunction()
-
 add_library(BlitHalPico INTERFACE)
 target_sources(BlitHalPico INTERFACE
+    ${CMAKE_CURRENT_LIST_DIR}/blit_launch.cpp
     ${CMAKE_CURRENT_LIST_DIR}/display.cpp
     ${CMAKE_CURRENT_LIST_DIR}/file.cpp
     ${CMAKE_CURRENT_LIST_DIR}/led.cpp
     ${CMAKE_CURRENT_LIST_DIR}/main.cpp
     ${CMAKE_CURRENT_LIST_DIR}/multiplayer.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/overlay.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/usb.cpp
     ${CMAKE_CURRENT_LIST_DIR}/usb_descriptors.c
 )
 
@@ -47,6 +27,7 @@ target_link_libraries(BlitHalPico INTERFACE
     pico_multicore pico_stdlib pico_unique_id pico_rand
     tinyusb_device
     FatFsBlitAPI
+    LauncherShared
 )
 
 target_include_directories(BlitHalPico INTERFACE
@@ -61,88 +42,6 @@ target_compile_options(BlitHalPico INTERFACE
     -Wno-ignored-qualifiers # pico-sdk generates a lot of these
 )
 
-if(DEFINED PICO_ADDON)
-    # for boards that don't have a board in the pico sdk
-    # (usually because they are an add-on for a regular pico)
-    set(CONFIG_PATH ${CMAKE_CURRENT_LIST_DIR}/board/${PICO_ADDON})
-    set(BOARD_ID ${PICO_ADDON})
-else()
-    set(CONFIG_PATH ${CMAKE_CURRENT_LIST_DIR}/board/${PICO_BOARD})
-    set(BOARD_ID ${PICO_BOARD})
-endif()
-
-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()
-
-# board id definition
-string(TOUPPER ${BOARD_ID} BOARD_ID)
-list(APPEND BLIT_BOARD_DEFINITIONS BLIT_BOARD_${BOARD_ID})
-
-# default drivers
-if(NOT BLIT_AUDIO_DRIVER)
-    set(BLIT_AUDIO_DRIVER "none")
-endif()
-if(NOT BLIT_DISPLAY_DRIVER)
-    set(BLIT_DISPLAY_DRIVER "none")
-endif()
-if(NOT BLIT_INPUT_DRIVER)
-    set(BLIT_INPUT_DRIVER "none")
-endif()
-if(NOT BLIT_STORAGE_DRIVER)
-    set(BLIT_STORAGE_DRIVER "flash")
-endif()
-if(NOT BLIT_USB_DRIVER)
-    set(BLIT_USB_DRIVER "device")
-endif()
-
-# driver dependencies
-if(BLIT_AUDIO_DRIVER STREQUAL "pwm")
-    set(BLIT_REQUIRE_PICO_EXTRAS TRUE)
-    list(APPEND BLIT_BOARD_LIBRARIES pico_audio_pwm)
-endif()
-
-if(BLIT_DISPLAY_DRIVER STREQUAL "picovision")
-    list(APPEND BLIT_BOARD_LIBRARIES hardware_i2c aps6404 swd_load)
-elseif(BLIT_DISPLAY_DRIVER STREQUAL "scanvideo")
-    set(BLIT_REQUIRE_PICO_EXTRAS TRUE)
-    set(BLIT_ENABLE_CORE1 TRUE)
-    list(APPEND BLIT_BOARD_LIBRARIES pico_scanvideo_dpi)
-endif()
-
-if(BLIT_INPUT_DRIVER STREQUAL "usb_hid")
-    list(APPEND BLIT_BOARD_DEFINITIONS INPUT_USB_HID)
-endif()
-
-if(BLIT_STORAGE_DRIVER STREQUAL "sd_spi")
-    list(APPEND BLIT_BOARD_DEFINITIONS STORAGE_SD)
-endif()
-
-if(BLIT_USB_DRIVER STREQUAL "host")
-    list(APPEND BLIT_BOARD_DEFINITIONS USB_HOST)
-    list(APPEND BLIT_BOARD_LIBRARIES tinyusb_host)
-endif()
-
-# late SDK init
-# (pico_sdk_init needs to be after importing extras, which we don't know if we'll need until now)
-if(BLIT_REQUIRE_PICO_EXTRAS)
-    include(pico_extras_import.cmake)
-endif()
-
-pico_sdk_init()
-
 # generate PIO headers (has to be after SDK init)
 pico_generate_pio_header(BlitHalPico ${CMAKE_CURRENT_LIST_DIR}/dbi-spi.pio)
 pico_generate_pio_header(BlitHalPico ${CMAKE_CURRENT_LIST_DIR}/dbi-8bit.pio)
@@ -170,58 +69,4 @@ endif()
 target_compile_definitions(BlitHalPico INTERFACE ${BLIT_BOARD_DEFINITIONS})
 target_link_libraries(BlitHalPico INTERFACE ${BLIT_BOARD_LIBRARIES})
 
-# functions
-function(blit_executable NAME)
-    message(STATUS "Processing ${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)
-    pico_enable_stdio_usb(${NAME} 0)
-
-    pico_add_extra_outputs(${NAME})
-
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.uf2
-        DESTINATION bin
-    )
-endfunction()
-
-function(blit_metadata TARGET FILE)
-    if(NOT IS_ABSOLUTE ${FILE})
-        set(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
-    endif()
-
-    # cause cmake to reconfigure whenever the asset list changes
-    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${FILE})
-
-    # get the inputs/outputs for the asset tool (at configure time)
-    execute_process(
-        COMMAND ${32BLIT_TOOLS_EXECUTABLE} cmake --config ${FILE} --cmake ${CMAKE_CURRENT_BINARY_DIR}/metadata.cmake
-        RESULT_VARIABLE TOOL_RESULT
-    )
-    if(${TOOL_RESULT})
-        message(FATAL_ERROR "Reading metadata config failed!\n")
-    endif()
-
-    include(${CMAKE_CURRENT_BINARY_DIR}/metadata.cmake)
-
-    # create metadata/binary info source at build time
-    set(METADATA_SOURCE "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_binary_info.cpp")
-
-    add_custom_command(
-        OUTPUT ${METADATA_SOURCE}
-        COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ${32BLIT_TOOLS_EXECUTABLE} metadata --force --config ${FILE} --pico-bi ${METADATA_SOURCE}
-        DEPENDS ${FILE}
-        VERBATIM
-    )
-
-    # add the generated source
-    target_sources(${TARGET} PRIVATE ${METADATA_SOURCE})
-
-    # avoid the fallback to target name
-    target_compile_definitions(${TARGET} PRIVATE PICO_NO_BI_PROGRAM_NAME=1)
-
-endfunction()
+set(BLIT_BOARD_DEFINITIONS ${BLIT_BOARD_DEFINITIONS} PARENT_SCOPE)