Skip to content

[WIP] nrf: Change Xenon board to use built-in bootloader. #5158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[WIP] nrf: Change Xenon board to use built-in bootloader. #5158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ports/nrf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ $(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os

.PHONY: all flash deploy sd binary hex

all: binary hex
all: binary hex dfu

OUTPUT_FILENAME = firmware

Expand All @@ -263,13 +263,20 @@ binary: $(BUILD)/$(OUTPUT_FILENAME).bin

$(BUILD)/$(OUTPUT_FILENAME).bin: $(BUILD)/$(OUTPUT_FILENAME).elf
$(OBJCOPY) -O binary $< $@
$(Q)$(PYTHON) particle_fw.py $@

## Create binary .hex file from the .out file
hex: $(BUILD)/$(OUTPUT_FILENAME).hex

$(BUILD)/$(OUTPUT_FILENAME).hex: $(BUILD)/$(OUTPUT_FILENAME).elf
$(OBJCOPY) -O ihex $< $@

dfu: $(BUILD)/$(OUTPUT_FILENAME).dfu

$(BUILD)/$(OUTPUT_FILENAME).dfu: $(BUILD)/$(OUTPUT_FILENAME).bin
$(ECHO) "Create $@"
$(Q)$(PYTHON) $(TOP)/tools/dfu.py -b 0x00030000:$< $@

FLASHER ?=

ifeq ($(FLASHER),)
Expand Down
35 changes: 35 additions & 0 deletions ports/nrf/boards/particle_xenon/board.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
GNU linker script for NRF52840, Particle bootloader layout
*/

_flash_size = 1M;
_ram_size = 252K;

/* produce a link error if there is not this amount of RAM for these sections */
_stack_size = 8K;
_minimum_heap_size = 128K;


/* Flash layout: bootloader | softdevice | application | filesystem */
/* RAM layout: softdevice RAM | application RAM */
_sd_size = DEFINED(_sd_size) ? _sd_size : 0;
_sd_ram = DEFINED(_sd_ram) ? _sd_ram : 0;
_fs_size = DEFINED(_fs_size) ? _fs_size : 64K; /* TODO: set to 0 if not using the filesystem */
_app_size = 512K - _fs_size;
_app_start = 192K;
_fs_start = _sd_size + _app_size;
_fs_end = _fs_start + _fs_size;
_app_ram_start = 0x20000000 + _sd_ram;
_app_ram_size = _ram_size - _sd_ram;
_heap_start = _ebss;
_heap_end = _ram_end - _stack_size;
_heap_size = _heap_end - _heap_start;

ASSERT(_heap_size >= _minimum_heap_size, "not enough RAM left for heap")

/* Specify the memory areas */
MEMORY
{
FLASH_TEXT (rx) : ORIGIN = _app_start, LENGTH = _app_size /* app */
RAM (xrw) : ORIGIN = _app_ram_start, LENGTH = _app_ram_size
}
2 changes: 1 addition & 1 deletion ports/nrf/boards/particle_xenon/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ MCU_SERIES = m4
MCU_VARIANT = nrf52
MCU_SUB_VARIANT = nrf52840
SOFTDEV_VERSION = 6.1.1
LD_FILES += boards/nrf52840_1M_256k.ld
LD_FILE = boards/particle_xenon/board.ld boards/common.ld

NRF_DEFINES += -DNRF52840_XXAA
12 changes: 12 additions & 0 deletions ports/nrf/device/startup_nrf52840.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ void Default_Handler(void) {
}

void Reset_Handler(void) {
// VTOR
*((volatile uint32_t*)0xe000ed08) = 0x30000;

uint32_t * p_src = &_sidata;
uint32_t * p_dest = &_sdata;

Expand Down Expand Up @@ -179,4 +182,13 @@ const func __Vectors[] __attribute__ ((section(".isr_vector"),used)) = {
SPIM3_IRQHandler,
0,
PWM3_IRQHandler,

0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

// At 0x200: particle module_info_t
0, 0, 0, 0, 0, 0, 0, 0,
};
12 changes: 12 additions & 0 deletions ports/nrf/particle_fw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import sys, struct, zlib

BASE = 0x00030000

with open(sys.argv[1], 'rb') as f:
data = bytearray(f.read())
struct.pack_into('<IIBBHHBBII', data, 0x200, BASE, BASE + len(data), 0, 0, 0x138, 0x0e, 0x03, 0, 0, 0)
crc = zlib.crc32(data)
print('CRC: {:08x}'.format(crc))
data += struct.pack('>I', crc)
with open(sys.argv[1], 'wb') as f:
f.write(data)