Commit f41dab2
fix: bump lib/nrfx and lib/tinyusb together, fix the fallout (#19)
* fix: bump lib/nrfx and lib/tinyusb together, fix the fallout
Renovate's PR #11 (nrfx digest) and #12 (tinyusb digest) each failed CI on
every board. Investigated both:
- nrfx alone (bumped to Renovate's target, nrfx 4.5.0/1b7bedb) breaks the
build immediately: nrfx 4.0 restructured its whole layout (mdk/ ->
bsp/stable/mdk/, etc.), so this repo's Makefile IPATHs can't find nrf.h at
all. That's a real rework, not a digest bump - pinned to v3.14.0 instead,
the last tag before the 4.0 restructure.
- tinyusb alone (Renovate's target, 5c0e31c) fails to compile against the
old 2019 nrfx pin: its nrf5x USB port calls nrfx's chip-errata functions
(nrf52_errata_199()) that don't exist yet at that nrfx version. The two
submodules move together.
With nrfx at v3.14.0 and tinyusb at 5c0e31c, three more issues surfaced,
all fixed here:
- tinyusb merged device/usbd_control.c into usbd.c; the Makefile's hardcoded
tinyusb C_SRC list still named the now-gone file.
- nrfx renamed nrf_wdt_started()/nrf_wdt_request_status() in the WDT HAL
(see lib/nrfx/CHANGELOG.md) - the one in-repo call site needed updating.
- nrfx's gcc_startup_<mcu>.S (since nrfx 3.x) copies .data via
__data_start/__data_end (no trailing underscore) instead of this repo's
__data_start__/__data_end__, plus three new RAM-loaded regions
(.sdata/.tdata/.fast) nothing here uses. Added alias symbols and
zero-length filler for the unused regions to linker/nrf_common.ld -
deliberately not swapping in nrfx's own updated linker script, which also
redefines .bss/.noinit placement and would fight this repo's board .ld
files' fixed-address NOINIT region (BLE bond exchange across a DFU
reset).
Verified: all 14 boards build and link clean via tools/build_all.py.
Not done here: real hardware testing. This is still the multi-year
boot-critical submodule bump AGENTS.md already flagged as needing it
before merge - a clean build is necessary, not sufficient.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* docs: record the CURRENT.UF2 restore gotcha found during hardware testing
Real RAK4631 hardware testing for this branch (see PR #19) hit this:
restoring an app via ghostfat's live CURRENT.UF2 dump left the device
hung on boot even though the bytes matched what was there before. A
normal release UF2 or OTA-DFU flash both worked fine immediately after.
Recording it so it doesn't get mistaken for a regression from this PR's
actual change (nrfx/tinyusb) next time someone hits it.
* docs: update the CURRENT.UF2 gotcha now that it's fixed, not untriaged
#20 root-caused and fixed what this note previously flagged as an open
mystery hit during this PR's hardware testing.
---------
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>1 parent a5e2266 commit f41dab2
6 files changed
Lines changed: 59 additions & 10 deletions
File tree
- lib
- sdk11/components/libraries/bootloader_dfu
- linker
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
93 | 107 | | |
94 | 108 | | |
95 | 109 | | |
| |||
128 | 142 | | |
129 | 143 | | |
130 | 144 | | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
131 | 156 | | |
132 | 157 | | |
133 | 158 | | |
134 | 159 | | |
135 | 160 | | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
194 | 194 | | |
195 | 195 | | |
196 | 196 | | |
197 | | - | |
198 | 197 | | |
199 | 198 | | |
200 | 199 | | |
| |||
Submodule nrfx updated from 7a4c9d9 to 11f57e5
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
| 120 | + | |
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| |||
Submodule tinyusb updated 3176 files
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
126 | 139 | | |
127 | 140 | | |
128 | 141 | | |
| |||
0 commit comments