From 37690823acb426f2f975fd6119878238d3f84cb5 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 9 Nov 2018 22:29:59 +0700 Subject: [PATCH] update segger project for SD 6.1.1 --- Makefile | 4 +-- README.md | 6 ++-- .../Adafruit_nRF52_Bootloader.emProject | 34 ++----------------- 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index ba0b263..61e5d05 100644 --- a/Makefile +++ b/Makefile @@ -372,10 +372,10 @@ all-release: help: @echo To flash (with jlink) a pre-built binary with a specific version to a board - @echo $$ make BOARD=feather_nrf52840_express VERSION=6.1.0r0 flash + @echo $$ make BOARD=feather_nrf52840_express VERSION=6.1.1r0 flash @echo @echo To flash (with dfu) a pre-built binary with a specific version to a board - @echo $$ make BOARD=feather_nrf52840_express VERSION=6.1.0r0 SERIAL=/dev/ttyACM0 dfu0-flash + @echo $$ make BOARD=feather_nrf52840_express VERSION=6.1.1r0 SERIAL=/dev/ttyACM0 dfu0-flash @echo @echo To compile and build the current code for a board @echo $$ make BOARD=feather_nrf52840_express all diff --git a/README.md b/README.md index 8176a60..49c4ebe 100644 --- a/README.md +++ b/README.md @@ -72,16 +72,16 @@ You can burn and/or upgrade the bootloader with either a J-link or DFU (serial) without the hassle of installing a toolchain and compiling the code. This is preferred if you are not developing/customizing the bootloader. -To flash version `6.1.0r0` using J-Link: +To flash version `6.1.1r0` using J-Link: ``` -make BOARD=feather_nrf52840_express VERSION=6.1.0r0 flash +make BOARD=feather_nrf52840_express VERSION=6.1.1r0 flash ``` To upgrade with dfu serial ``` -make BOARD=feather_nrf52840_express VERSION=6.1.0r0 dfu-flash +make BOARD=feather_nrf52840_express VERSION=6.1.1r0 dfu-flash ``` Pre-builtin binaries are in the `bin` directory: diff --git a/src/segger/Adafruit_nRF52_Bootloader.emProject b/src/segger/Adafruit_nRF52_Bootloader.emProject index 8413a67..7bcc0ac 100644 --- a/src/segger/Adafruit_nRF52_Bootloader.emProject +++ b/src/segger/Adafruit_nRF52_Bootloader.emProject @@ -25,7 +25,7 @@ gcc_entry_point="Reset_Handler" linker_memory_map_file="$(ProjectDir)/nRF52840_xxAA_MemoryMap.xml" linker_section_placement_file="$(ProjectDir)/flash_placement.xml" - macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;sdkDir=../../lib/sdk/components;sdk11Dir=../../lib/sdk11/components;sdDir=../../lib/softdevice/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API;tusbDir=../../lib/tinyusb/src;nrfxDir=../../lib/nrfx" + macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;sdkDir=../../lib/sdk/components;sdk11Dir=../../lib/sdk11/components;sdDir=../../lib/softdevice/s140_nrf52_6.1.1/s140_nrf52_6.1.1_API;tusbDir=../../lib/tinyusb/src;nrfxDir=../../lib/nrfx" project_directory="" project_type="Executable" target_reset_script="Reset();" @@ -231,34 +231,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -397,11 +369,11 @@