Skip to content

Remove second arguments from pico_package_uf2_output functions #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 24, 2025
Merged

Remove second arguments from pico_package_uf2_output functions #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88455f0
Remove second arguments from pico_package_uf2_output functions
will-v-pi Jul 22, 2025
eb79f92
Clarify universal binary load_map message
will-v-pi Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bootloaders/encrypted/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pico_embed_pt_in_binary(enc_bootloader ${CMAKE_CURRENT_LIST_DIR}/enc-pt.json)

# create absolute uf2, and package in flash
pico_set_uf2_family(enc_bootloader "absolute")
pico_package_uf2_output(enc_bootloader 0x10000000)
pico_package_uf2_output(enc_bootloader)

# optionally enable USB output in addition to UART
# pico_enable_stdio_usb(enc_bootloader 1)
Expand Down Expand Up @@ -86,7 +86,7 @@ pico_hash_binary(hello_serial_enc)
pico_encrypt_binary(hello_serial_enc ${CMAKE_CURRENT_LIST_DIR}/privateaes.bin ${CMAKE_CURRENT_LIST_DIR}/ivsalt.bin)

# package uf2 in flash
pico_package_uf2_output(hello_serial_enc 0x10000000)
pico_package_uf2_output(hello_serial_enc)

# optionally enable USB output in addition to UART
# pico_enable_stdio_usb(hello_serial_enc 1)
Expand Down
2 changes: 1 addition & 1 deletion bootloaders/uart/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ target_link_libraries(uart_binary pico_stdlib)
pico_set_binary_type(uart_binary no_flash)

# package uf2 in flash
pico_package_uf2_output(uart_binary 0x10000000)
pico_package_uf2_output(uart_binary)

# create map/bin/hex/uf2 file etc.
pico_add_extra_outputs(uart_binary)
Expand Down
4 changes: 2 additions & 2 deletions encrypted/hello_encrypted/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pico_encrypt_binary(hello_encrypted
EMBED)

# package uf2 in flash
pico_package_uf2_output(hello_encrypted 0x10000000)
pico_package_uf2_output(hello_encrypted)

# create map/bin/hex/uf2 file etc.
pico_add_extra_outputs(hello_encrypted)
Expand Down Expand Up @@ -86,7 +86,7 @@ pico_encrypt_binary(hello_encrypted_mbedtls
OTP_KEY_PAGE 29)

# package uf2 in flash
pico_package_uf2_output(hello_encrypted_mbedtls 0x10000000)
pico_package_uf2_output(hello_encrypted_mbedtls)

# create map/bin/hex/uf2 file etc.
pico_add_extra_outputs(hello_encrypted_mbedtls)
Expand Down
5 changes: 3 additions & 2 deletions universal/wrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ function(pico_add_extra_outputs TARGET)
if (NOT (PICO_PLATFORM MATCHES rp2040))
get_target_property(BINARY_TYPE ${SOURCE_TARGET} PICO_TARGET_BINARY_TYPE)
if (${BINARY_TYPE} STREQUAL "no_flash")
message("Packaging no_flash universal binary to SRAM, so it has a load_map")
pico_package_uf2_output(${SOURCE_TARGET} 0x20000000)
message("Ensuring no_flash universal binary has a load_map")
# This is required so it is copied to the correct location in SRAM
pico_ensure_load_map(${SOURCE_TARGET})
endif()
endif()
_pico_add_extra_outputs(${SOURCE_TARGET})
Expand Down