Skip to content

Commit 6cf28a3

Browse files
committed
Change partition ID to 0x776966696669726d (wififirm) and use data UF2 family
Adds CYW43_WIFI_FW_PARTITION_ID define to override the partition ID
1 parent b600894 commit 6cf28a3

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

src/rp2_common/pico_cyw43_driver/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ if (EXISTS ${PICO_CYW43_DRIVER_PATH}/${CYW43_DRIVER_TEST_FILE})
211211
pico_hash_binary(${TARGET}_firmware)
212212
pico_hash_binary(${TARGET}_firmware_tbyb)
213213

214-
pico_set_uf2_family(${TARGET}_firmware 0x12345678)
215-
pico_set_uf2_family(${TARGET}_firmware_tbyb 0x12345678)
214+
pico_set_uf2_family(${TARGET}_firmware data)
215+
pico_set_uf2_family(${TARGET}_firmware_tbyb data)
216216

217217
pico_package_uf2_output(${TARGET}_firmware 0x10000000)
218218
pico_package_uf2_output(${TARGET}_firmware_tbyb 0x10000000)

src/rp2_common/pico_cyw43_driver/cyw43_driver.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ static async_context_t *cyw43_async_context = NULL;
2727
#include "boot/picobin.h"
2828
#include <stdlib.h>
2929

30+
// PICO_CONFIG: CYW43_WIFI_FW_PARTITION_ID, ID of Wi-Fi firmware partition, type=int, default=0x776966696669726d (wififirm), group=pico_cyw43_driver
31+
#ifndef CYW43_WIFI_FW_PARTITION_ID
32+
#define CYW43_WIFI_FW_PARTITION_ID 0x776966696669726d // wififirm
33+
#endif
34+
3035
int32_t cyw43_wifi_fw_len;
3136
int32_t cyw43_clm_len;
3237
uintptr_t fw_data;
@@ -134,7 +139,7 @@ bool cyw43_driver_init(async_context_t *context) {
134139
uint64_t id = 0;
135140
id |= buffer[i++];
136141
id |= ((uint64_t)(buffer[i++]) << 32ull);
137-
if (id == 0x123456789abcdef0) {
142+
if (id == CYW43_WIFI_FW_PARTITION_ID) {
138143
picked_p = p;
139144
}
140145
}

src/rp2_common/pico_cyw43_driver/wifi_pt.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
},
2424
{
2525
"name": "Wi-Fi Firmware",
26-
"id": "0x123456789abcdef0",
26+
"id": "0x776966696669726d",
2727
"start": "3500k",
2828
"size": "240K",
29-
"families": ["0x12345678"],
29+
"families": ["data"],
3030
"permissions": {
3131
"secure": "rw",
3232
"nonsecure": "rw",
@@ -38,7 +38,7 @@
3838
{
3939
"start": "3500k",
4040
"size": "240k",
41-
"families": ["0x12345678"],
41+
"families": ["data"],
4242
"permissions": {
4343
"secure": "rw",
4444
"nonsecure": "rw",

0 commit comments

Comments
 (0)