diff --git a/Makefile b/Makefile
index 94468af..3c01faf 100644
--- a/Makefile
+++ b/Makefile
@@ -339,10 +339,11 @@ $(info LDFLAGS  $(LDFLAGS))
 $(info )
 endif
 
-.phony: all clean size flash sd
+.phony: all clean size flash sd erase
 
 all: $(BUILD)/$(OUTPUT_FILENAME).out size
 
+#********* Flash target *******************
 flash: $(BUILD)/$(OUTPUT_FILENAME).hex
 	@echo Flashing: $<
 	$(NRFJPROG) --program $< --sectoranduicrerase -f nrf52 --reset
@@ -351,6 +352,9 @@ sd:
 	@echo Flashing: $(SD_HEX)
 	$(NRFJPROG) --program $(SD_HEX) -f nrf52 --chiperase  --reset	
 
+erase:
+	@echo Erasing chip
+	$(NRFJPROG) --eraseall -f nrf52
 
 ## Create build directories
 $(BUILD):
diff --git a/README.md b/README.md
index 1da2f2f..7d88ea5 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,10 @@ To flash SoftDevice (with full chip erase)
 
 	$ make BOARD=feather52840 sd
 
+To full erase chip
+
+	$ make BOARD=feather52840 erase
+
 For the list of supported boards, try to type make without `BOARD=`
 
 	$ make
diff --git a/src/segger/nRF52840_xxAA_MemoryMap.xml b/src/segger/nRF52840_xxAA_MemoryMap.xml
index 6606005..032ff15 100644
--- a/src/segger/nRF52840_xxAA_MemoryMap.xml
+++ b/src/segger/nRF52840_xxAA_MemoryMap.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE Board_Memory_Definition_File>
 <root name="nRF52840_xxAA">
-  <MemorySegment name="FLASH" start="0x000F4000" size="0xA000" access="ReadOnly" />
-  <!--MemorySegment name="FLASH" start="0x000ED000" size="0x11000" access="ReadOnly" /-->
+  <!--MemorySegment name="FLASH" start="0x000F4000" size="0xA000" access="ReadOnly" /-->
+  <MemorySegment name="FLASH" start="0x000ED000" size="0x11000" access="ReadOnly" />
   <MemorySegment name="BOOTLOADER_SETTINGS" start="0x000FF000" size="0x1000" access="ReadOnly" />
   <MemorySegment name="MBR_PARAMS_PAGE" start="0x000FE000" size="0x1000" access="ReadOnly" />
   <MemorySegment name="UICR_BOOTLOADER" start="0x10001014" size="0x04" access="ReadOnly" />
diff --git a/src/segger/nrf52840_bootloader.emProject b/src/segger/nrf52840_bootloader.emProject
index e00aba8..41053d4 100644
--- a/src/segger/nrf52840_bootloader.emProject
+++ b/src/segger/nrf52840_bootloader.emProject
@@ -94,11 +94,6 @@
         <file file_name="../boards/pca10056.h" />
       </folder>
     </folder>
-    <configuration
-      Name="Debug"
-      gcc_optimization_level="Debug"
-      link_use_linker_script_file="No"
-      linker_section_placement_file="flash_placement.xml" />
     <configuration Name="Debug Single" gcc_optimization_level="Debug" />
     <configuration
       Name="Release Single"
@@ -353,6 +348,9 @@
             <configuration
               Name="Feather52840 Size++"
               build_exclude_from_build="Yes" />
+            <configuration
+              Name="Feather52840"
+              build_exclude_from_build="Yes" />
           </file>
           <file file_name="../../lib/nrfx/mdk/ses_startup_nrf52840.s">
             <configuration
@@ -369,6 +367,9 @@
             <configuration
               Name="Feather52840 Size++"
               build_exclude_from_build="Yes" />
+            <configuration
+              Name="Feather52840"
+              build_exclude_from_build="Yes" />
           </file>
           <file file_name="../../lib/nrfx/mdk/system_nrf52.h" />
           <file file_name="../../lib/nrfx/mdk/system_nrf52840.c" />
@@ -384,18 +385,9 @@
         </folder>
       </folder>
     </folder>
-    <configuration
-      Name="Debug Size++"
-      build_treat_warnings_as_errors="Yes"
-      c_preprocessor_definitions="DEBUG_SIZE_EXPAND" />
-    <configuration
-      Name="Feather52840 Size++"
-      linker_memory_map_file="nRF52840_xxAA_MemoryMap.xml" />
   </project>
   <configuration
-    Name="Debug"
-    c_preprocessor_definitions="DEBUG"
-    gcc_debugging_level="Level 3"
-    gcc_optimization_level="None" />
-  <configuration Name="Feather52840 Size++" />
+      Name="Feather52840"
+      build_treat_warnings_as_errors="Yes"
+      c_preprocessor_definitions="DEBUG_SIZE_EXPAND" /> 
 </solution>