Skip to content

Commit 116d898

Browse files
committed
Other tidyups
Remove reference to WB vs W blob Tidy up python script and remove printout
1 parent 79ff41a commit 116d898

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

src/rp2_common/pico_cyw43_driver/CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ if (EXISTS ${PICO_CYW43_DRIVER_PATH}/${CYW43_DRIVER_TEST_FILE})
197197

198198
find_package (Python3 REQUIRED COMPONENTS Interpreter)
199199

200-
# Wifi firmware blob
201-
add_custom_target(${TARGET}_firmware_blob DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/firmware_wb_blob.S)
202-
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/firmware_wb_blob.S
203-
COMMAND ${Python3_EXECUTABLE} ${PICO_CYW43_DRIVER_CURRENT_PATH}/cyw43_firmware.py ${PICO_CYW43_DRIVER_PATH}/firmware/wb43439A0_7_95_49_00_combined.h ${CMAKE_CURRENT_BINARY_DIR}/firmware_wb_blob.S
200+
# CYW43 firmware blob
201+
add_custom_target(${TARGET}_firmware_blob DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/firmware_blob.S)
202+
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/firmware_blob.S
203+
COMMAND ${Python3_EXECUTABLE} ${PICO_CYW43_DRIVER_CURRENT_PATH}/cyw43_firmware.py ${PICO_CYW43_DRIVER_PATH}/firmware/wb43439A0_7_95_49_00_combined.h ${CMAKE_CURRENT_BINARY_DIR}/firmware_blob.S
204204
)
205205

206206
# Create UF2s for regular and TBYB firmwares
@@ -217,12 +217,10 @@ if (EXISTS ${PICO_CYW43_DRIVER_PATH}/${CYW43_DRIVER_TEST_FILE})
217217

218218
target_compile_definitions(${TARGET}_firmware PRIVATE
219219
NO_PICO_PLATFORM=1
220-
WB_FIRMWARE=1
221220
)
222221
target_compile_definitions(${TARGET}_firmware_tbyb PRIVATE
223222
NO_PICO_PLATFORM=1
224223
PICO_CRT0_IMAGE_TYPE_TBYB=1
225-
WB_FIRMWARE=1
226224
)
227225

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

src/rp2_common/pico_cyw43_driver/cyw43_firmware.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,33 @@
55
# SPDX-License-Identifier: BSD-3-Clause
66

77
import sys
8+
import re
9+
10+
assert len(sys.argv) == 3
11+
12+
cyw43_wifi_fw_len = -1
13+
cyw43_clm_len = -1
814

915
with open(sys.argv[1], "r") as f:
1016
data = f.read()
11-
lines = data.split(";")
12-
for line in lines[1].split("\n"):
17+
statements = data.split(";")
18+
for line in statements[1].split("\n"):
1319
if "#define CYW43_WIFI_FW_LEN" in line:
14-
cyw43_wifi_fw_len = int(line.split(")")[0].split("(")[-1])
20+
matches = re.search(r"#define\s+\S+\s+\((\S+)\)", line)
21+
cyw43_wifi_fw_len = int(matches[1])
1522
if "#define CYW43_CLM_LEN" in line:
16-
cyw43_clm_len = int(line.split(")")[0].split("(")[-1])
17-
data = lines[0]
23+
matches = re.search(r"#define\s+\S+\s+\((\S+)\)", line)
24+
cyw43_clm_len = int(matches[1])
25+
if cyw43_wifi_fw_len > 0 and cyw43_clm_len > 0:
26+
break
27+
data = statements[0]
1828
bits = data.split(",")
1929
bits[0] = bits[0].split("{")[-1]
2030
bits[-1] = bits[-1].split("}")[0]
2131
for i in range(len(bits)):
2232
bits[i] = bits[i].strip()
2333
bits[i] = bits[i].strip(',')
2434
bits[i] = int(bits[i], base=0)
25-
print(f"Start {bits[4]}, end {bits[-1]}, num {len(bits)}")
26-
print(bits[:10])
27-
28-
print(f"Wifi {cyw43_wifi_fw_len}, clm {cyw43_clm_len}")
2935

3036
data = (
3137
cyw43_wifi_fw_len.to_bytes(4, 'little', signed=True) +

src/rp2_common/pico_cyw43_driver/include/pico/cyw43_driver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#endif
2222

2323
#if CYW43_USE_FIRMWARE_PARTITION
24-
// PICO_CONFIG: CYW43_FIRMWARE_PARTITION_ID, ID of Wi-Fi firmware partition, type=int, default=0x776966696669726d (wififirm), group=pico_cyw43_driver
24+
// PICO_CONFIG: CYW43_FIRMWARE_PARTITION_ID, ID of Wi-Fi firmware partition which must match the ID used in the partition table JSON, type=int, default=0x776966696669726d, group=pico_cyw43_driver
2525
#ifndef CYW43_FIRMWARE_PARTITION_ID
2626
#define CYW43_FIRMWARE_PARTITION_ID 0x776966696669726d // wififirm
2727
#endif

src/rp2_common/pico_cyw43_driver/wifi_firmware.S

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ _lm_item:
6060
.word PICOBIN_BLOCK_MARKER_END
6161
embedded_block_end:
6262

63-
#if WB_FIRMWARE
64-
#include "firmware_wb_blob.S"
65-
#else
66-
#include "firmware_w_blob.S"
67-
#endif
63+
#include "firmware_blob.S"
6864

6965
firmware_end:

0 commit comments

Comments
 (0)