Merge pull request #118 from adafruit/develop

Mass clean up

Author: hathach

Makefile

@@ -105,9 +105,7 @@ both bootloader and the Nordic SoftDevice, you can freely upgrade/downgrade to a
 ## How to compile and build
 
 You should only continue if you are looking to develop bootloader for your own.
-You must have have  a J-Link available to "unbrick" your device.
-
-### Option 1: Build with Makefile
+You must have have a J-Link available to "unbrick" your device.
 
 Prerequisites
 
@@ -117,7 +115,7 @@ Prerequisites
 To build:
 
 ```
-make BOARD=feather_nrf52840_express all combinehex
+make BOARD=feather_nrf52840_express all
 ```
 
 To flash the bootloader with JLink:
@@ -138,12 +136,6 @@ To flash SoftDevice (and chip erase):
 make BOARD=feather_nrf52840_express sd
 ```
 
-To erase all of flash:
-
-```
-make BOARD=feather_nrf52840_express erase
-```
-
 For the list of supported boards, run `make` without `BOARD=` :
 
 ```
@@ -167,13 +159,11 @@ make: *** [_build/main.o] Error 127
 ```
 
 ... you may need to pass the location of the GCC ARM toolchain binaries to `make` using
-the variable `GNU_INSTALL_ROOT` as below:
+the variable `CROSS_COMPILE` as below:
 ```
-$ make GNU_INSTALL_ROOT=/opt/gcc-arm-none-eabi-9-2019-q4-major/bin/ BOARD=feather_nrf52832 all
+$ make CROSS_COMPILE=/opt/gcc-arm-none-eabi-9-2019-q4-major/bin/arm-none-eabi- BOARD=feather_nrf52832 all
 ```
 
-_Please note that the path needs a trailing path separator (a `/`)_
-
 #### 2. `mergehex: No such file or directory`
 
 Make sure that `mergehex` is available from the command-line. This binary is
@@ -184,22 +174,3 @@ part of Nordic's nRF5x Command Line Tools.
 Make sure that `nrfjprog` is available from the command-line. This binary is
 part of Nordic's nRF5x Command Line Tools.
 
-On POSIX-type systems you can temporarily add the path to `nrfjprog` via a
-variation on the following command:
-
-```
-$ export PATH=$PATH:/location/of/nRF5x-Command-Line-Tools_9_7_2_OSX/nrfjprog
-```
-
-### Option 2: Build using Segger Embedded Studio
-
-For easier debugging you can also use [SES](https://www.segger.com/products/development-tools/embedded-studio/).
-The project file is located at `src/segger/Adafruit_nRF52_Bootloader.emProject`.
-
-> **Note**: SES only flashes the bootloader when you click download, not the SoftDevice.
-You need to flash the SoftDevice beforehand if you haven't already done so.
-As mentioned above do something like:
-
-```
-make BOARD=feather_nrf52840_express sd
-```

README.md

@@ -442,7 +442,8 @@ uint32_t bootloader_dfu_sd_update_continue(void)
 
 uint32_t bootloader_dfu_sd_update_finalize(void)
 {
-    dfu_update_status_t update_status = {DFU_UPDATE_SD_SWAPPED, };
+    dfu_update_status_t update_status = { 0 };
+    update_status.status_code = DFU_UPDATE_SD_SWAPPED;
 
     bootloader_dfu_update_process(update_status);