Skip to content

Commit

Permalink
Fix GCC14.1 compile error in w25x10cls.S
Browse files Browse the repository at this point in the history
GCC14 doesn't like the 2-character temporary label "00" and throws an error
.../pico-sdk/src/rp2040/boot_stage2/boot2_w25x10cl.S: Assembler messages:
.../pico-sdk/src/rp2040/boot_stage2/boot2_w25x10cl.S:147: Error: junk at end of line, first unrecognized character is `0'
.../pico/rp2040/pico-sdk/src/rp2040/boot_stage2/boot2_w25x10cl.S:150: Error: garbage following instruction -- `beq 00b'

Convert it to a single number, "1", like in other boot2xxx.S files

Fixes #1999
  • Loading branch information
earlephilhower committed Oct 24, 2024
1 parent 3708588 commit 114480e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/rp2040/boot_stage2/boot2_w25x10cl.S
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ regular_func _stage2_boot
// status register and checking for the "RX FIFO Not Empty" flag to assert.

movs r1, #SSI_SR_RFNE_BITS
00:
1:
ldr r0, [r3, #SSI_SR_OFFSET] // Read status register
tst r0, r1 // RFNE status flag set?
beq 00b // If not then wait
beq 1b // If not then wait

// At this point CN# will be deasserted and the SPI clock will not be running.
// The Winbond WX25X10CL device will be in continuous read, dual I/O mode and
Expand Down

0 comments on commit 114480e

Please sign in to comment.