Skip to content

Commit

Permalink
Post-bootloader EFL/SPI fixes. (#17661)
Browse files Browse the repository at this point in the history
* Fixup read address for EFL driver.

* Fixup sequencing of SPI.

* Lock during init of EFL backing store.
  • Loading branch information
tzarc authored Jul 13, 2022
1 parent 2a0d490 commit dc70ba6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 0 additions & 1 deletion platforms/chibios/drivers/spi_master.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ __attribute__((weak)) void spi_init(void) {
palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), SPI_MOSI_FLAGS);
palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), SPI_MISO_FLAGS);
#endif
spiUnselect(&SPI_DRIVER);
spiStop(&SPI_DRIVER);
currentSlavePin = NO_PIN;
}
Expand Down
5 changes: 4 additions & 1 deletion platforms/chibios/drivers/wear_leveling/wear_leveling_efl.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ bool backing_store_init(void) {
bs_dprintf("Init\n");
flash = (BaseFlash *)&EFLD1;

// Need to re-lock the EFL, as if we've just had the bootloader executing it'll already be unlocked.
backing_store_lock();

const flash_descriptor_t *desc = flashGetDescriptor(flash);
uint32_t counter = 0;

Expand Down Expand Up @@ -132,7 +135,7 @@ bool backing_store_lock(void) {

bool backing_store_read(uint32_t address, backing_store_int_t *value) {
uint32_t offset = (base_offset + address);
backing_store_int_t *loc = (backing_store_int_t *)offset;
backing_store_int_t *loc = (backing_store_int_t *)flashGetOffsetAddress(flash, offset);
*value = ~(*loc);
bs_dprintf("Read ");
wl_dump(offset, value, sizeof(backing_store_int_t));
Expand Down

0 comments on commit dc70ba6

Please sign in to comment.