Skip to content

Commit 2016c21

Browse files
authored
BUGFIX: [IOTUC-762] Eliminate compiler warnings (ARMmbed#160)
* Fix trace format specifiers * Undefine MBED_CLOUD_CLIENT_UPDATE_STORAGE before redefining
1 parent 239fece commit 2016c21

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

source/active_application.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ bool eraseActiveFirmware(uint32_t firmwareSize)
255255
tr_error("Firmware size 0x%" PRIX32 " rounded up to the nearest sector boundary 0x%" \
256256
PRIX32 " is larger than the maximum application size 0x%" PRIX32,
257257
firmwareSize, erase_end_addr - MBED_CONF_MBED_BOOTLOADER_APPLICATION_START_ADDRESS,
258-
MBED_CONF_MBED_BOOTLOADER_MAX_APPLICATION_SIZE);
258+
(uint32_t) MBED_CONF_MBED_BOOTLOADER_MAX_APPLICATION_SIZE);
259259
}
260260
}
261261

@@ -284,7 +284,7 @@ bool writeActiveFirmwareHeader(arm_uc_firmware_details_t *details)
284284

285285
/* coverity[no_escape] */
286286
MBED_BOOTLOADER_ASSERT((programSize <= fw_metadata_hdr_size),
287-
"Header program size %" PRIu32 " bigger than expected header %d\r\n",
287+
"Header program size %" PRIu32 " bigger than expected header %" PRIu32 "\r\n",
288288
programSize, fw_metadata_hdr_size);
289289

290290
/* pad buffer to 0xFF */

source/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ const arm_uc_installer_details_t bootloader = {
5353
binary size if ARM_UC_USE_PAL_BLOCKDEVICE is set and not running tests */
5454
#if defined(ARM_UC_USE_PAL_BLOCKDEVICE) && (ARM_UC_USE_PAL_BLOCKDEVICE==1) && \
5555
(!defined(BOOTLOADER_POWER_CUT_TEST) || (BOOTLOADER_POWER_CUT_TEST != 1))
56+
#undef MBED_CLOUD_CLIENT_UPDATE_STORAGE
5657
#define MBED_CLOUD_CLIENT_UPDATE_STORAGE ARM_UCP_FLASHIAP_BLOCKDEVICE_READ_ONLY
5758
#endif
5859

0 commit comments

Comments
 (0)