sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes to compile with gcc11 #925 

Target code changes are pure for formal correctness and not tested!
This commit is contained in:
Uwe Bonnes 2021-09-07 22:58:21 +02:00 committed by UweBonnes
parent 28623e6b27
commit e1a928beb1
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platforms/hosted/bmp_hosted.h
View File

@ -28,9 +28,9 @@ typedef struct bmp_info_s {
bmp_type_t bmp_type; bmp_type_t bmp_type;
char dev; char dev;
char serial[64]; char serial[64];
char manufacturer[128]; char manufacturer[512];
char product[128]; char product[256];
char version[128]; char version[256];
bool is_jtag; bool is_jtag;
#if HOSTED_BMP_ONLY != 1 #if HOSTED_BMP_ONLY != 1
libusb_context *libusb_ctx; libusb_context *libusb_ctx;

6
src/target/kinetis.c
View File

@ -486,10 +486,10 @@ static int kl_gen_flash_done(struct target_flash *f)
kl_gen_command(f->t, FTFE_CMD_PROGRAM_PHRASE, kl_gen_command(f->t, FTFE_CMD_PROGRAM_PHRASE,
FLASH_SECURITY_BYTE_ADDRESS - 4, (uint8_t*)vals); FLASH_SECURITY_BYTE_ADDRESS - 4, (uint8_t*)vals);
} else { } else {
uint32_t val = target_mem_read32(f->t, FLASH_SECURITY_BYTE_ADDRESS); uint32_t vals[2] = {target_mem_read32(f->t, FLASH_SECURITY_BYTE_ADDRESS), 0};
val = (val & 0xffffff00) | FLASH_SECURITY_BYTE_UNSECURED; vals[0] = (vals[0] & 0xffffff00) | FLASH_SECURITY_BYTE_UNSECURED;
kl_gen_command(f->t, FTFA_CMD_PROGRAM_LONGWORD, kl_gen_command(f->t, FTFA_CMD_PROGRAM_LONGWORD,
FLASH_SECURITY_BYTE_ADDRESS, (uint8_t*)&val); FLASH_SECURITY_BYTE_ADDRESS, (uint8_t*)&vals);
} }
return 0; return 0;

6
src/target/nxpke04.c
View File

@ -373,10 +373,10 @@ static int ke04_flash_done(struct target_flash *f)
/* Load the security byte from its field */ /* Load the security byte from its field */
/* Note: Cumulative programming is not allowed according to the RM */ /* Note: Cumulative programming is not allowed according to the RM */
uint32_t val = target_mem_read32(f->t, FLASH_SECURITY_WORD_ADDRESS); uint32_t vals[2] = {target_mem_read32(f->t, FLASH_SECURITY_WORD_ADDRESS), 0};
val = (val & 0xff00ffff) | (FLASH_SECURITY_BYTE_UNSECURED << 16); vals[0] = (vals[0] & 0xff00ffff) | (FLASH_SECURITY_BYTE_UNSECURED << 16);
ke04_command(f->t, CMD_PROGRAM_FLASH_32, ke04_command(f->t, CMD_PROGRAM_FLASH_32,
FLASH_SECURITY_WORD_ADDRESS, (uint8_t *)&val); FLASH_SECURITY_WORD_ADDRESS, (uint8_t *)&vals);
return 0; return 0;
} }