mirror of https://github.com/google/pebble
spelling: firmware
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
parent
c4b4244b2d
commit
22e6f64653
|
@ -165,7 +165,7 @@ void fw_copy_check_update_fw(void) {
|
||||||
break;
|
break;
|
||||||
case UPDATE_FW_ERROR_MICRO_FLASH_MANGLED:
|
case UPDATE_FW_ERROR_MICRO_FLASH_MANGLED:
|
||||||
// We've broken our internal flash when trying to update our normal
|
// We've broken our internal flash when trying to update our normal
|
||||||
// firmware. Fall back immediately to the recovery firmare.
|
// firmware. Fall back immediately to the recovery firmware.
|
||||||
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_ONE);
|
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_ONE);
|
||||||
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_TWO);
|
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_TWO);
|
||||||
system_reset();
|
system_reset();
|
||||||
|
|
|
@ -170,7 +170,7 @@ void check_update_fw(void) {
|
||||||
break;
|
break;
|
||||||
case UPDATE_FW_ERROR_MICRO_FLASH_MANGLED:
|
case UPDATE_FW_ERROR_MICRO_FLASH_MANGLED:
|
||||||
// We've broken our internal flash when trying to update our normal
|
// We've broken our internal flash when trying to update our normal
|
||||||
// firmware. Fall back immediately to the recovery firmare.
|
// firmware. Fall back immediately to the recovery firmware.
|
||||||
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_ONE);
|
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_ONE);
|
||||||
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_TWO);
|
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_TWO);
|
||||||
system_reset();
|
system_reset();
|
||||||
|
|
|
@ -156,7 +156,7 @@ void check_update_fw(void) {
|
||||||
break;
|
break;
|
||||||
case UPDATE_FW_ERROR_MICRO_FLASH_MANGLED:
|
case UPDATE_FW_ERROR_MICRO_FLASH_MANGLED:
|
||||||
// We've broken our internal flash when trying to update our normal
|
// We've broken our internal flash when trying to update our normal
|
||||||
// firmware. Fall back immediately to the recovery firmare.
|
// firmware. Fall back immediately to the recovery firmware.
|
||||||
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_ONE);
|
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_ONE);
|
||||||
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_TWO);
|
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_TWO);
|
||||||
system_reset();
|
system_reset();
|
||||||
|
|
|
@ -209,7 +209,7 @@ void check_update_fw(void) {
|
||||||
break;
|
break;
|
||||||
case UPDATE_FW_ERROR_MICRO_FLASH_MANGLED:
|
case UPDATE_FW_ERROR_MICRO_FLASH_MANGLED:
|
||||||
// We've broken our internal flash when trying to update our normal
|
// We've broken our internal flash when trying to update our normal
|
||||||
// firmware. Fall back immediately to the recovery firmare.
|
// firmware. Fall back immediately to the recovery firmware.
|
||||||
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_ONE);
|
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_ONE);
|
||||||
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_TWO);
|
boot_bit_set(BOOT_BIT_FW_START_FAIL_STRIKE_TWO);
|
||||||
system_reset();
|
system_reset();
|
||||||
|
|
|
@ -28,7 +28,7 @@ typedef enum SystemMessageType {
|
||||||
SysMsgFirmwareComplete = 0x02,
|
SysMsgFirmwareComplete = 0x02,
|
||||||
SysMsgFirmwareFail = 0x03,
|
SysMsgFirmwareFail = 0x03,
|
||||||
SysMsgFirmwareUpToDate = 0x04,
|
SysMsgFirmwareUpToDate = 0x04,
|
||||||
// SysMsgFirmarewOutOfDate = 0x05, DEPRECATED
|
// SysMsgFirmwareOutOfDate = 0x05, DEPRECATED
|
||||||
SysMsgReconnectRequestStop = 0x06,
|
SysMsgReconnectRequestStop = 0x06,
|
||||||
SysMsgReconnectRequestStart = 0x07,
|
SysMsgReconnectRequestStart = 0x07,
|
||||||
SysMsgMAPRetry = 0x08, // MAP is no longer used
|
SysMsgMAPRetry = 0x08, // MAP is no longer used
|
||||||
|
|
2
wscript
2
wscript
|
@ -1129,7 +1129,7 @@ def _create_qemu_image_micro(ctx, path_to_firmware_hex):
|
||||||
img = IntelHex(ctx.env.BOOTLOADER_HEX)
|
img = IntelHex(ctx.env.BOOTLOADER_HEX)
|
||||||
img.merge(IntelHex(path_to_firmware_hex), overlap='replace')
|
img.merge(IntelHex(path_to_firmware_hex), overlap='replace')
|
||||||
|
|
||||||
# Write firwmare image and pad up to next 512 byte multiple. This is because QEMU
|
# Write firmware image and pad up to next 512 byte multiple. This is because QEMU
|
||||||
# assumes all block devices are multiples of 512 byte sectors
|
# assumes all block devices are multiples of 512 byte sectors
|
||||||
img.padding = 0xff
|
img.padding = 0xff
|
||||||
flash_end = ((img.maxaddr() + 511) // 512) * 512
|
flash_end = ((img.maxaddr() + 511) // 512) * 512
|
||||||
|
|
Loading…
Reference in New Issue