Skip to content

Improve pico_use_wifi_firmware_partition docs #2580

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 5 commits into from
Jul 24, 2025
Merged

Improve pico_use_wifi_firmware_partition docs #2580

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6328cdc
Improve pico_use_wifi_firmware_partition docs
will-v-pi Jul 22, 2025
b5d92db
Replace assert with hard_assert
will-v-pi Jul 23, 2025
fe6f885
firmware -> wifi_firmware
will-v-pi Jul 23, 2025
4a7d2ed
Maybe improve wording?
will-v-pi Jul 23, 2025
e1a8dcb
Clarify TBYB, and add `-ux` to firmware load
will-v-pi Jul 24, 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
56 changes: 33 additions & 23 deletions src/rp2_common/pico_cyw43_driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,16 @@ if (EXISTS ${PICO_CYW43_DRIVER_PATH}/${CYW43_DRIVER_TEST_FILE})
# NO_EMBEDDED_PT argument (for example, if you need to chain into the binary, it
# can't contain a partition table).
#
# This will create additional UF2 files for the CYW43 firmware and a TBYB version of the
# CYW43 firmware. You will need to flash one of these to each device once, after loading the
# partition table. For example using picotool:
#
# `picotool load TARGET.uf2`;
# `picotool reboot -u`;
# `picotool load TARGET_wifi_firmware.uf2 -x`;
#
# Then on subsequent updates, you can just flash the TARGET.uf2 file to the device.
#
# \param\ NO_EMBEDDED_PT If set, will not embed a partition table in the binary
function(pico_use_wifi_firmware_partition TARGET)
set(options NO_EMBEDDED_PT)
Expand All @@ -204,50 +214,50 @@ if (EXISTS ${PICO_CYW43_DRIVER_PATH}/${CYW43_DRIVER_TEST_FILE})
)

# Create UF2s for regular and TBYB firmwares
add_executable(${TARGET}_firmware
add_executable(${TARGET}_wifi_firmware
${PICO_CYW43_DRIVER_CURRENT_PATH}/wifi_firmware.S)
add_executable(${TARGET}_firmware_tbyb
add_executable(${TARGET}_wifi_firmware_tbyb
${PICO_CYW43_DRIVER_CURRENT_PATH}/wifi_firmware.S)

add_dependencies(${TARGET}_firmware ${TARGET}_firmware_blob)
add_dependencies(${TARGET}_firmware_tbyb ${TARGET}_firmware_blob)
add_dependencies(${TARGET}_wifi_firmware ${TARGET}_firmware_blob)
add_dependencies(${TARGET}_wifi_firmware_tbyb ${TARGET}_firmware_blob)

target_include_directories(${TARGET}_firmware PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(${TARGET}_firmware_tbyb PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(${TARGET}_wifi_firmware PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(${TARGET}_wifi_firmware_tbyb PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

target_compile_definitions(${TARGET}_firmware PRIVATE
target_compile_definitions(${TARGET}_wifi_firmware PRIVATE
NO_PICO_PLATFORM=1
)
target_compile_definitions(${TARGET}_firmware_tbyb PRIVATE
target_compile_definitions(${TARGET}_wifi_firmware_tbyb PRIVATE
NO_PICO_PLATFORM=1
PICO_CRT0_IMAGE_TYPE_TBYB=1
)

target_link_options(${TARGET}_firmware PRIVATE -nostartfiles -nodefaultlibs LINKER:--script=${PICO_CYW43_DRIVER_CURRENT_PATH}/wifi_firmware.ld)
target_link_options(${TARGET}_firmware_tbyb PRIVATE -nostartfiles -nodefaultlibs LINKER:--script=${PICO_CYW43_DRIVER_CURRENT_PATH}/wifi_firmware.ld)
target_link_options(${TARGET}_wifi_firmware PRIVATE -nostartfiles -nodefaultlibs LINKER:--script=${PICO_CYW43_DRIVER_CURRENT_PATH}/wifi_firmware.ld)
target_link_options(${TARGET}_wifi_firmware_tbyb PRIVATE -nostartfiles -nodefaultlibs LINKER:--script=${PICO_CYW43_DRIVER_CURRENT_PATH}/wifi_firmware.ld)

target_link_libraries(${TARGET}_firmware boot_picobin_headers)
target_link_libraries(${TARGET}_firmware_tbyb boot_picobin_headers)
target_link_libraries(${TARGET}_wifi_firmware boot_picobin_headers)
target_link_libraries(${TARGET}_wifi_firmware_tbyb boot_picobin_headers)

get_target_property(hasSigfile ${TARGET} PICOTOOL_SIGFILE)
if (hasSigfile)
pico_sign_binary(${TARGET}_firmware ${sigfile})
pico_sign_binary(${TARGET}_firmware_tbyb ${sigfile})
pico_sign_binary(${TARGET}_wifi_firmware ${sigfile})
pico_sign_binary(${TARGET}_wifi_firmware_tbyb ${sigfile})
endif()

pico_hash_binary(${TARGET}_firmware)
pico_hash_binary(${TARGET}_firmware_tbyb)
pico_hash_binary(${TARGET}_wifi_firmware)
pico_hash_binary(${TARGET}_wifi_firmware_tbyb)

pico_set_uf2_family(${TARGET}_firmware cyw43-firmware)
pico_set_uf2_family(${TARGET}_firmware_tbyb cyw43-firmware)
pico_set_uf2_family(${TARGET}_wifi_firmware cyw43-firmware)
pico_set_uf2_family(${TARGET}_wifi_firmware_tbyb cyw43-firmware)

pico_package_uf2_output(${TARGET}_firmware 0x10000000)
pico_package_uf2_output(${TARGET}_firmware_tbyb 0x10000000)
pico_package_uf2_output(${TARGET}_wifi_firmware 0x10000000)
pico_package_uf2_output(${TARGET}_wifi_firmware_tbyb 0x10000000)

pico_add_extra_outputs(${TARGET}_firmware)
pico_add_extra_outputs(${TARGET}_firmware_tbyb)
pico_add_extra_outputs(${TARGET}_wifi_firmware)
pico_add_extra_outputs(${TARGET}_wifi_firmware_tbyb)

add_dependencies(${TARGET}
${TARGET}_firmware ${TARGET}_firmware_tbyb)
${TARGET}_wifi_firmware ${TARGET}_wifi_firmware_tbyb)
endfunction()
endif()
6 changes: 3 additions & 3 deletions src/rp2_common/pico_cyw43_driver/cyw43_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ bool cyw43_driver_init(async_context_t *context) {
uint32_t buffer[(16 * 4) + 1] = {}; // maximum of 16 partitions, each with maximum of 4 words returned, plus 1
int ret = rom_get_partition_table_info(buffer, count_of(buffer), PT_INFO_PARTITION_LOCATION_AND_FLAGS | PT_INFO_PARTITION_ID);

assert(buffer[0] == (PT_INFO_PARTITION_LOCATION_AND_FLAGS | PT_INFO_PARTITION_ID));
hard_assert(buffer[0] == (PT_INFO_PARTITION_LOCATION_AND_FLAGS | PT_INFO_PARTITION_ID));

if (ret > 0) {
int i = 1;
Expand Down Expand Up @@ -171,8 +171,8 @@ bool cyw43_driver_init(async_context_t *context) {

CYW43_DEBUG("Chosen CYW43 firmware in partition %d\n", picked_p);
int ret = rom_get_partition_table_info(buffer, count_of(buffer), PT_INFO_PARTITION_LOCATION_AND_FLAGS | PT_INFO_SINGLE_PARTITION | (picked_p << 24));
assert(buffer[0] == (PT_INFO_PARTITION_LOCATION_AND_FLAGS | PT_INFO_SINGLE_PARTITION));
assert(ret == 3);
hard_assert(buffer[0] == (PT_INFO_PARTITION_LOCATION_AND_FLAGS | PT_INFO_SINGLE_PARTITION));
hard_assert(ret == 3);

uint32_t location_and_permissions = buffer[1];
uint32_t saddr = ((location_and_permissions >> PICOBIN_PARTITION_LOCATION_FIRST_SECTOR_LSB) & 0x1fffu) * FLASH_SECTOR_SIZE;
Expand Down
Loading