Index: firmware/App/Modes/Update.c
===================================================================
diff -u -rdad52d69c15f96d2b7ca7e22138f5d07a3948a9f -r36d3216f0b5fb36aa6a162941d3e0dcddca288a8
--- firmware/App/Modes/Update.c	(.../Update.c)	(revision dad52d69c15f96d2b7ca7e22138f5d07a3948a9f)
+++ firmware/App/Modes/Update.c	(.../Update.c)	(revision 36d3216f0b5fb36aa6a162941d3e0dcddca288a8)
@@ -54,11 +54,11 @@
     unsigned int bytes = 16;
 
     Fapi_issueProgrammingCommand((uint32_t *)dst,
-                                     (uint8_t *)src,
-                                     (uint32_t) bytes,
-                                     0,
-                                     0,
-                                     Fapi_AutoEccGeneration);
+                                 (uint8_t *)src,
+                                 (uint32_t) bytes,
+                                 0,
+                                 0,
+                                 Fapi_AutoEccGeneration);
 
     while(Fapi_checkFsmForReady() == Fapi_Status_FsmBusy);
 
Index: firmware/source/sys_link.cmd
===================================================================
diff -u -r683afe86db1f97d56f03b780bac9e294d015fadf -r36d3216f0b5fb36aa6a162941d3e0dcddca288a8
--- firmware/source/sys_link.cmd	(.../sys_link.cmd)	(revision 683afe86db1f97d56f03b780bac9e294d015fadf)
+++ firmware/source/sys_link.cmd	(.../sys_link.cmd)	(revision 36d3216f0b5fb36aa6a162941d3e0dcddca288a8)
@@ -56,8 +56,8 @@
 
 MEMORY
 {
-	VECTORS (X)  : origin=0x00010020 length=0x00000020  //APP_START_ADDRESS = 0x10020
-    FLASH0  (RX) : origin=0x00010040 length=0x0012FFC0
+    VECTORS (X)  : origin=0x00000000 length=0x00000020
+    FLASH0  (RX) : origin=0x00000020 length=0x0013FFE0
     STACKS  (RW) : origin=0x08000000 length=0x00005800
     RAM     (RW) : origin=0x08005800 length=0x0002a800
 
Index: firmware/source/sys_startup.c
===================================================================
diff -u -rc0f6037ed4cec5ede472d267bc2b4ca685fc179e -r36d3216f0b5fb36aa6a162941d3e0dcddca288a8
--- firmware/source/sys_startup.c	(.../sys_startup.c)	(revision c0f6037ed4cec5ede472d267bc2b4ca685fc179e)
+++ firmware/source/sys_startup.c	(.../sys_startup.c)	(revision 36d3216f0b5fb36aa6a162941d3e0dcddca288a8)
@@ -373,7 +373,6 @@
     /* Disable PBIST clocks and disable memory self-test mode */
     pbistStop();
 
-
 /* USER CODE BEGIN (37) */
 /* USER CODE END */