add intelhex submodule

clean up

Author: hathach

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "lib/uf2"]
 	path = lib/uf2
 	url = https://github.com/microsoft/uf2.git
+[submodule "lib/intelhex"]
+	path = lib/intelhex
+	url = https://github.com/python-intelhex/intelhex.git

lib/intelhex

@@ -416,11 +416,11 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
         // Should be Softdevice
         flash_nrf5x_write(bl->targetAddr, bl->data, bl->payloadSize, true);
       }
+#endif
       else if ( bl->targetAddr < USER_FLASH_START )
       {
         PRINTF("skip writing to MBR\r\n");
       }
-#endif
       else
       {
         state->aborted = true;

src/usb/uf2/ghostfat.c

@@ -24,11 +24,8 @@
 
 #include "nrfx.h"
 #include "nrfx_power.h"
-
-#ifdef SOFTDEVICE_PRESENT
 #include "nrf_sdm.h"
 #include "nrf_soc.h"
-#endif
 
 #include "nrf_usbd.h"
 #include "tusb.h"
@@ -63,7 +60,6 @@ void usb_init(bool cdc_only)
   // We need to invoke the handler based on the status initially
   uint32_t usb_reg;
 
-#ifdef SOFTDEVICE_PRESENT
   uint8_t sd_en = false;
 
   if ( is_sd_existed() )
@@ -79,7 +75,6 @@ void usb_init(bool cdc_only)
 
     sd_power_usbregstatus_get(&usb_reg);
   }else
-#endif
   {
     // Power module init
     const nrfx_power_config_t pwr_cfg = { 0 };