Skip to content

Fix spi_flash_write_page to stop at len or page boundary #690

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
dgarske merged 1 commit into from
Feb 23, 2026
Merged

Fix spi_flash_write_page to stop at len or page boundary #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 23 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ tools/check_config/check_config
tools/test-expect-version/test-expect-version
tools/test-update-server/server
tools/uart-flash-server/ufserver
tools/unit-tests/unit-parser
tools/bin-assemble/bin-assemble
tools/elf-parser/elf-parser
tools/fdt-parser/fdt-parser
Expand All @@ -135,6 +134,29 @@ config/*.ld
test-lib
lib-fs

#unit tests

tools/unit-tests/unit-aes128
tools/unit-tests/unit-aes256
tools/unit-tests/unit-chacha20
tools/unit-tests/unit-delta
tools/unit-tests/unit-enc-nvm
tools/unit-tests/unit-enc-nvm-flagshome
tools/unit-tests/unit-extflash
tools/unit-tests/unit-image
tools/unit-tests/unit-libwolfboot-extra
tools/unit-tests/unit-mock-state
tools/unit-tests/unit-nvm
tools/unit-tests/unit-nvm-flagshome
tools/unit-tests/unit-parser
tools/unit-tests/unit-pci
tools/unit-tests/unit-pkcs11_store
tools/unit-tests/unit-sectorflags
tools/unit-tests/unit-spi-flash
tools/unit-tests/unit-update-flash
tools/unit-tests/unit-update-ram


# Elf preprocessing tools
tools/squashelf/**
!tools/squashelf/squashelf.c
Expand Down
2 changes: 1 addition & 1 deletion src/spi_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static int RAMFUNCTION spi_flash_write_page(uint32_t address, const void *data,
address++;
spi_read();
len--;
} while ((address & (SPI_FLASH_PAGE_SIZE - 1)) != 0);
} while (len > 0 && (address & (SPI_FLASH_PAGE_SIZE - 1)) != 0);
spi_cs_off(SPI_CS_PIO_BASE, SPI_CS_FLASH);
}
wait_busy();
Expand Down
11 changes: 7 additions & 4 deletions tools/unit-tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ LDFLAGS+=-ftest-coverage



TESTS:=unit-parser unit-extflash unit-aes128 unit-aes256 unit-chacha20 unit-pci \
unit-mock-state unit-sectorflags unit-image unit-nvm unit-nvm-flagshome \
unit-enc-nvm unit-enc-nvm-flagshome unit-delta unit-update-flash \
unit-update-ram unit-pkcs11_store
TESTS:=unit-parser unit-extflash unit-spi-flash unit-aes128 unit-aes256 \
unit-chacha20 unit-pci unit-mock-state unit-sectorflags unit-image \
unit-nvm unit-nvm-flagshome unit-enc-nvm unit-enc-nvm-flagshome \
unit-delta unit-update-flash unit-update-ram unit-pkcs11_store

all: $(TESTS)

Expand Down Expand Up @@ -91,6 +91,9 @@ unit-parser: ../../include/target.h unit-parser.c
unit-extflash: ../../include/target.h unit-extflash.c
gcc -o $@ $^ $(CFLAGS) $(LDFLAGS)

unit-spi-flash: ../../include/target.h unit-spi-flash.c
gcc -o $@ $^ $(CFLAGS) $(LDFLAGS)

unit-aes128: ../../include/target.h unit-extflash.c
gcc -o $@ $^ $(CFLAGS) $(LDFLAGS)

Expand Down
Loading