From f535967d774f081cd1334b16c12ed32ea9ebedfe Mon Sep 17 00:00:00 2001 From: fanoush Date: Fri, 17 Jan 2020 19:18:54 +0000 Subject: [PATCH] nrf: Add support for DFU bootloader From https://github.com/fanoush/ds-d6/blob/c4579ff25166722566c1b9251a20f99027972 588/micropython/micropython/DS-D6-micropython.diff [daniel@redfelineninja.org.uk: Seperated out from the rest of the DS-D6 support] --- ports/nrf/boards/nrf52832_512k_64k_bldr78.ld | 10 +++++++++ ports/nrf/modules/machine/modmachine.c | 22 ++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ports/nrf/boards/nrf52832_512k_64k_bldr78.ld diff --git a/ports/nrf/boards/nrf52832_512k_64k_bldr78.ld b/ports/nrf/boards/nrf52832_512k_64k_bldr78.ld new file mode 100644 index 000000000..998c58629 --- /dev/null +++ b/ports/nrf/boards/nrf52832_512k_64k_bldr78.ld @@ -0,0 +1,10 @@ +/* + GNU linker script for NRF52832 +*/ + +_flash_size = 0x78000; /* bootloader starts at 0x78000 */ +_ram_size = 64K; + +/* produce a link error if there is not this amount of RAM for these sections */ +_stack_size = 8K; +_minimum_heap_size = 32K; diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c index 48730c849..6d45a1983 100644 --- a/ports/nrf/modules/machine/modmachine.c +++ b/ports/nrf/modules/machine/modmachine.c @@ -145,6 +145,24 @@ STATIC mp_obj_t machine_reset(void) { } MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset); +#if MICROPY_PY_MACHINE_DFU_BOOTLOADER +STATIC mp_obj_t machine_enter_ota_dfu(void) { + const int DFU_MAGIC_OTA_RESET = 0xa8; + NRF_POWER->GPREGRET = DFU_MAGIC_OTA_RESET; + NVIC_SystemReset(); + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_0(machine_enter_ota_dfu_obj, machine_enter_ota_dfu); + +STATIC mp_obj_t machine_enter_serial_dfu(void) { + const int DFU_MAGIC_SERIAL_ONLY_RESET = 0x4e; + NRF_POWER->GPREGRET = DFU_MAGIC_SERIAL_ONLY_RESET; + NVIC_SystemReset(); + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_0(machine_enter_serial_dfu_obj, machine_enter_serial_dfu); +#endif + STATIC mp_obj_t machine_soft_reset(void) { pyexec_system_exit = PYEXEC_FORCED_EXIT; mp_raise_type(&mp_type_SystemExit); @@ -193,6 +211,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) }, { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&machine_info_obj) }, { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) }, +#if MICROPY_PY_MACHINE_DFU_BOOTLOADER + { MP_ROM_QSTR(MP_QSTR_enter_ota_dfu), MP_ROM_PTR(&machine_enter_ota_dfu_obj) }, + { MP_ROM_QSTR(MP_QSTR_enter_serial_dfu), MP_ROM_PTR(&machine_enter_serial_dfu_obj) }, +#endif { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) }, { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&machine_enable_irq_obj) }, { MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&machine_disable_irq_obj) },