coelner/foboot
1
0
Fork 0
mirror of https://github.com/im-tomu/foboot.git synced 2024-09-20 02:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from TomKeddie/tomk_201090605_imagesize_override

Browse Source 
Add optional override of rescue image offset
This commit is contained in:
Sean Cross 2019-06-06 08:53:18 +08:00 committed by GitHub
commit bf5b4d2eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sw/src/dfu.c
View File

@ -27,8 +27,11 @@
#include <dfu.h>
#include <rgb.h>
#include <generated/mem.h>
#include <generated/csr.h>
#define RESCUE_IMAGE_OFFSET 262144
#ifndef CONFIG_RESCUE_IMAGE_OFFSET
# define CONFIG_RESCUE_IMAGE_OFFSET 262144
#endif
#define RAM_BOOT_SENTINAL 0x17ab0f23
#define ERASE_SIZE 65536 // Erase block size (in bytes)
@ -60,7 +63,7 @@ static uint32_t dfu_target_address;
uint32_t dfu_origin_addr(void) {
if (ram_mode)
return ram_mode;
return RESCUE_IMAGE_OFFSET + SPIFLASH_BASE;
return CONFIG_RESCUE_IMAGE_OFFSET + SPIFLASH_BASE;
}
static void set_state(dfu_state_t new_state, dfu_status_t new_status) {
@ -76,7 +79,7 @@ static void set_state(dfu_state_t new_state, dfu_status_t new_status) {
dfu_status = new_status;
}
static bool ftfl_busy()
static bool ftfl_busy(void)
{
if (ram_mode)
return 0;
@ -85,7 +88,7 @@ static bool ftfl_busy()
return spiIsBusy(spi);
}
static void ftfl_busy_wait()
static void ftfl_busy_wait(void)
{
// Wait for the flash memory controller to finish any pending operation.
while (ftfl_busy())
@ -136,7 +139,7 @@ static uint32_t address_for_block(unsigned blockNum)
if (ram_mode)
starting_offset = ram_mode;
else
starting_offset = RESCUE_IMAGE_OFFSET;
starting_offset = CONFIG_RESCUE_IMAGE_OFFSET;
return starting_offset + (blockNum * DFU_TRANSFER_SIZE);
}
@ -313,4 +316,4 @@ bool dfu_abort(void)
{
set_state(dfuIDLE, OK);
return true;
}
}