diff options
| author | Paul Selkirk <paul@psgd.org> | 2017-02-22 14:11:12 -0500 |
|---|---|---|
| committer | Paul Selkirk <paul@psgd.org> | 2017-02-22 17:45:31 -0500 |
| commit | 189df371631a2b7bef91803d449e47470ad6a7bf (patch) | |
| tree | 1986828d38cdd6507c96640f6370b433be720892 /projects/hsm | |
| parent | 56fcfdf3bec384a74eb9deb070f342142bbacff3 (diff) | |
Refactor flash code.
Diffstat (limited to 'projects/hsm')
| -rw-r--r-- | projects/hsm/mgmt-fpga.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/projects/hsm/mgmt-fpga.c b/projects/hsm/mgmt-fpga.c index d76315e..06f2a26 100644 --- a/projects/hsm/mgmt-fpga.c +++ b/projects/hsm/mgmt-fpga.c @@ -3,7 +3,7 @@ * ----------- * CLI code to manage the FPGA configuration etc. * - * Copyright (c) 2016, NORDUnet A/S All rights reserved. + * Copyright (c) 2016-2017, NORDUnet A/S All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -55,7 +55,13 @@ extern hal_user_t user; static volatile uint32_t dfu_offset = 0; -static int _flash_write_callback(uint8_t *buf, size_t len) { +static int _flash_write_callback(uint8_t *buf, size_t len) +{ + if ((dfu_offset % FPGACFG_SECTOR_SIZE) == 0) + /* first page in sector, need to erase sector */ + if (fpgacfg_erase_sector(dfu_offset / FPGACFG_SECTOR_SIZE) != 1) + return CLI_ERROR; + int res = fpgacfg_write_data(dfu_offset, buf, BITSTREAM_UPLOAD_CHUNK_SIZE) == 1; dfu_offset += BITSTREAM_UPLOAD_CHUNK_SIZE; return res; @@ -104,7 +110,7 @@ static int cmd_fpga_bitstream_erase(struct cli_def *cli, const char *command, ch * * This command could be made to accept an argument indicating the whole memory should be erased. */ - if (! fpgacfg_erase_sectors(1)) { + if (fpgacfg_erase_sector(0) != 0) { cli_print(cli, "Erasing first sector in FPGA config memory failed"); return CLI_ERROR; } |