makefile to generate bootloader-nosd.uf2

everything seems working

Author: hathach

Makefile

@@ -210,7 +210,6 @@ ifeq ($(DEBUG), 1)
 
 	CFLAGS += -ggdb -DCFG_DEBUG -DSEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
 	IPATH += $(RTT_SRC)/RTT
-  C_SRC += $(RTT_SRC)/RTT/SEGGER_RTT_printf.c
   C_SRC += $(RTT_SRC)/RTT/SEGGER_RTT.c
 endif
 
@@ -314,7 +313,58 @@ endif
 .PHONY: all clean flash dfu-flash sd gdbflash gdb
 
 # default target to build
-all: $(BUILD)/$(OUT_FILE)-nosd.out $(BUILD)/$(MERGED_FILE).hex $(BUILD)/$(MERGED_FILE).uf2
+all: $(BUILD)/$(OUT_FILE).out $(BUILD)/$(OUT_FILE)-nosd.hex $(BUILD)/$(OUT_FILE)-nosd.uf2 $(BUILD)/$(MERGED_FILE).hex $(BUILD)/$(MERGED_FILE).zip
+
+#------------------- Compile rules -------------------
+
+# Create build directories
+$(BUILD):
+	@$(MK) $@
+
+clean:
+	@$(RM) $(BUILD)
+
+# Create objects from C SRC files
+$(BUILD)/%.o: %.c
+	@echo CC $(notdir $<)
+	@$(CC) $(CFLAGS) $(INC_PATHS) -c -o $@ $<
+
+# Assemble files
+$(BUILD)/%.o: %.S
+	@echo AS $(notdir $<)
+	@$(CC) -x assembler-with-cpp $(ASFLAGS) $(INC_PATHS) -c -o $@ $<
+
+# Link
+$(BUILD)/$(OUT_FILE).out: $(BUILD) $(OBJECTS)
+	@echo LD $(notdir $@)
+	@$(CC) -o $@ $(LDFLAGS) $(OBJECTS) -Wl,--start-group $(LIBS) -Wl,--end-group
+	@$(SIZE) $@
+
+#------------------- Binary generator -------------------
+
+# Create hex file (no sd, no mbr)
+$(BUILD)/$(OUT_FILE).hex: $(BUILD)/$(OUT_FILE).out
+	@echo CR $(notdir $@)
+	@$(OBJCOPY) -O ihex $< $@
+
+# Hex file with mbr (still no SD)
+$(BUILD)/$(OUT_FILE)-nosd.hex: $(BUILD)/$(OUT_FILE).hex
+	@echo CR $(notdir $@)
+	@python lib/intelhex/scripts/hexmerge.py --overlap=replace -o $@ $< $(MBR_HEX)
+
+# Bootolader only uf2
+$(BUILD)/$(OUT_FILE)-nosd.uf2: $(BUILD)/$(OUT_FILE)-nosd.hex
+	@echo CR $(notdir $@)
+	python lib/uf2/utils/uf2conv.py -f 0x239A0029 -c -o $@ $^
+
+# merge bootloader and sd hex together
+$(BUILD)/$(MERGED_FILE).hex: $(BUILD)/$(OUT_FILE).hex
+	@echo CR $(notdir $@)
+	@python lib/intelhex/scripts/hexmerge.py -o $@ $< $(SD_HEX)
+
+# Create pkg zip file for bootloader+SD combo to use with DFU CDC
+$(BUILD)/$(MERGED_FILE).zip: $(BUILD)/$(OUT_FILE).hex
+	@$(NRFUTIL) dfu genpkg --dev-type 0x0052 --dev-revision $(DFU_DEV_REV) --bootloader $< --softdevice $(SD_HEX) $@
 
 #------------------- Flash target -------------------
 
@@ -342,7 +392,7 @@ erase:
 # flash SD only
 sd:
 	@echo Flashing: $(SD_HEX)
-	$(NRFJPROG) --program $(SD_HEX) -f nrf52 --sectorerase  --reset
+	$(NRFJPROG) --program $(SD_HEX) -f nrf52 --sectorerase --reset
 
 # flash MBR only
 mbr:
@@ -353,53 +403,5 @@ gdbflash: $(BUILD)/$(MERGED_FILE).hex
 	@echo Flashing: $<
 	@$(GDB_BMP) -nx --batch -ex 'load $<' -ex 'compare-sections' -ex 'kill'
 
-gdb: $(BUILD)/$(OUT_FILE)-nosd.out
+gdb: $(BUILD)/$(OUT_FILE).out
 	$(GDB_BMP) $<
-
-#------------------- Compile rules -------------------
-
-# Create build directories
-$(BUILD):
-	@$(MK) $@
-
-clean:
-	@$(RM) $(BUILD)
-
-# Create objects from C SRC files
-$(BUILD)/%.o: %.c
-	@echo CC $(notdir $<)
-	@$(CC) $(CFLAGS) $(INC_PATHS) -c -o $@ $<
-
-# Assemble files
-$(BUILD)/%.o: %.S
-	@echo AS $(notdir $<)
-	@$(CC) -x assembler-with-cpp $(ASFLAGS) $(INC_PATHS) -c -o $@ $<
-
-# Link
-$(BUILD)/$(OUT_FILE)-nosd.out: $(BUILD) $(OBJECTS)
-	@echo LD $(notdir $@)
-	@$(CC) -o $@ $(LDFLAGS) $(OBJECTS) -Wl,--start-group $(LIBS) -Wl,--end-group
-	@$(SIZE) $@
-
-#------------------- Binary generator -------------------
-
-# Create hex file
-$(BUILD)/$(OUT_FILE)-nosd.hex: $(BUILD)/$(OUT_FILE)-nosd.out
-	@echo CR $(notdir $@)
-	@$(OBJCOPY) -O ihex $< $@
-
-# merge bootloader and sd hex together
-$(BUILD)/$(MERGED_FILE).hex: $(BUILD)/$(OUT_FILE)-nosd.hex
-	@echo CR $(notdir $@)
-	@mergehex -q -m $< $(SD_HEX) -o $@
-
-$(BUILD)/$(MERGED_FILE).uf2: $(BUILD)/$(MERGED_FILE).hex
-	@echo CR $(notdir $@)
-	python lib/uf2/utils/uf2conv.py -f 0x239A0029 -c -o  $@ $^
-
-# Create pkg zip file for bootloader+SD combo to use with DFU Serial
-.PHONY: genpkg
-genpkg: $(BUILD)/$(MERGED_FILE).zip
-
-$(BUILD)/$(MERGED_FILE).zip: $(BUILD)/$(OUT_FILE)-nosd.hex
-	@$(NRFUTIL) dfu genpkg --dev-type 0x0052 --dev-revision $(DFU_DEV_REV) --bootloader $< --softdevice $(SD_HEX) $@

README.md

@@ -20,33 +20,20 @@ This is a CDC/DFU/UF2 bootloader for nRF52 boards.
 - Particle Xenon
 
 UF2 is an easy-to-use bootloader that appears as a flash drive. You can just copy `.uf2`-format
-application images to the flash drive to load new firmware.
-See https://github.com/Microsoft/uf2 and https://github.com/adafruit/uf2-samdx1
-for more information.
+application images to the flash drive to load new firmware. See https://github.com/Microsoft/uf2 and https://github.com/adafruit/uf2-samdx1 for more information.
 
-[adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil),
-a modified version of [Nordic nrfutil](https://github.com/NordicSemiconductor/pc-nrfutil),
-is required to perform DFU.
-Install `python3` if it is not installed already and run this command to install adafruit-nrfutil from PyPi:
+[adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil), a modified version of [Nordic nrfutil](https://github.com/NordicSemiconductor/pc-nrfutil), is required to perform DFU. Install `python3` if it is not installed already and run this command to install adafruit-nrfutil from PyPi:
 
 ```
 $ pip3 install --user adafruit-nrfutil
 ```
 
-This repository depends on the following submodules:
-
-- [tinyusb](https://github.com/hathach/tinyusb)
-- [nrfx](https://github.com/NordicSemiconductor/nrfx)
-
-Note that `tinyusb` also includes `nrfx` as a submodule, so you need
-to initialize and update  submodules with the `--recursive`` flag.
-
 Clone this repo with following commands, or fork it for your own development
 
 ```
 git clone https://github.com/adafruit/Adafruit_nRF52_Bootloader
 cd Adafruit_nRF52_Bootloader
-git submodule update --init --recursive
+git submodule update --init
 ```
 
 ## Features
@@ -111,6 +98,7 @@ Prerequisites
 
 - ARM GCC
 - Nordic's [nRF5x Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
+- [Python IntelHex](https://pypi.org/project/IntelHex/)
 
 To build:
 

lib/sdk11/components/libraries/bootloader_dfu/bootloader.c

@@ -358,11 +358,14 @@ void bootloader_app_start(void)
 
   if ( is_sd_existed() )
   {
+    PRINTF("SoftDevice exist\r\n");
     // App starts after SoftDevice
     app_addr = SD_SIZE_GET(MBR_SIZE);
     fwd_ret = sd_softdevice_vector_table_base_set(app_addr);
   }else
   {
+    PRINTF("SoftDevice not exist\r\n");
+
     // App starts right after MBR
     app_addr = MBR_SIZE;
     sd_mbr_command_t command =
@@ -377,6 +380,8 @@ void bootloader_app_start(void)
   // unlikely failed to forward vector table, manually set forward address
   if ( fwd_ret != NRF_SUCCESS )
   {
+    PRINT_HEX(fwd_ret);
+
     // MBR use first 4-bytes of SRAM to store foward address
     *(uint32_t *)(0x20000000) = app_addr;
   }

lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c

@@ -150,7 +150,9 @@ static void dfu_prepare_func_app_erase(uint32_t image_size)
 
     for ( uint32_t i = 0; i < page_count; i++ )
     {
-      nrfx_nvmc_page_erase(DFU_BANK_0_REGION_START + i * CODE_PAGE_SIZE);
+      uint32_t const addr = DFU_BANK_0_REGION_START + i * CODE_PAGE_SIZE;
+      PRINTF("Erase 0x%08lX\r\n", addr);
+      nrfx_nvmc_page_erase(addr);
     }
 
     // invoke complete callback

segger/Adafruit_nRF52_Bootloader.emProject

@@ -332,9 +332,9 @@
           <file file_name="../src/boards/feather_nrf52840_express/board.h" />
           <file file_name="../src/boards/feather_nrf52840_express/pinconfig.c" />
         </folder>
+        <file file_name="../src/boards/boards.c" />
+        <file file_name="../src/boards/boards.h" />
       </folder>
-      <file file_name="../src/boards.c" />
-      <file file_name="../src/boards.h" />
       <folder
         Name="cmsis"
         exclude=""

src/flash_nrf5x.c

@@ -45,8 +45,13 @@ void flash_nrf5x_flush (bool need_erase)
     // - nRF52840 dfu serial/uf2 are USB-based which are DMA and should have no problems.
     //
     // Note: MSC uf2 does not erase page in advance like dfu serial
-    if ( need_erase ) nrfx_nvmc_page_erase(_fl_addr);
+    if ( need_erase )
+    {
+      PRINTF("Erase 0x%08lX\r\n", _fl_addr);
+      nrfx_nvmc_page_erase(_fl_addr);
+    }
 
+    PRINTF("Write 0x%08lX\r\n", _fl_addr);
     nrfx_nvmc_words_write(_fl_addr, (uint32_t *) _fl_buf, FLASH_PAGE_SIZE / 4);
   }
 

src/main.c

@@ -144,6 +144,7 @@ bool is_ota(void)
 
 void softdev_mbr_init(void)
 {
+  PRINTF("SD_MBR_COMMAND_INIT_SD\r\n");
   sd_mbr_command_t com = { .command = SD_MBR_COMMAND_INIT_SD };
   sd_mbr_command(&com);
 }
@@ -153,6 +154,8 @@ void softdev_mbr_init(void)
 //--------------------------------------------------------------------+
 int main(void)
 {
+  PRINTF("Bootlaoder Start\r\n");
+
   // Populate Boot Address and MBR Param into MBR if not already
   // MBR_BOOTLOADER_ADDR/MBR_PARAM_PAGE_ADDR are used if available, else UICR registers are used
   // Note: skip it for now since this will prevent us to change the size of bootloader in the future
@@ -271,6 +274,7 @@ int main(void)
 
   if (bootloader_app_is_valid() && !bootloader_dfu_sd_in_progress())
   {
+    PRINTF("App is valid\r\n");
     if ( is_sd_existed() )
     {
       // MBR forward IRQ to SD (if not already)