bootloaders / BLAPI: Bug in address map

It turns out that there was a bug in both the bootloader and the app linker
scripts, which allowed the app image to extend to the bootloader settings
page, and hence erase the settings when programmed.
This would only have been felt if the app firmware actually used this page,
which until now hasn't happened.
While this could be considered a BLAPI change, I'm considering it an
implementation bug and not updating the BLAPI version number.
After this fix, both the app linker script and bootloaders now enforce that
the app doesn't extend into the last page.

Author: ytai

firmware/blapi/app_IOIO0020.gld

@@ -15,7 +15,7 @@ MEMORY
 {
   data  (a!xr)   : ORIGIN = 0x800,         LENGTH = 0x17800
   app_ivt        : ORIGIN = 0x5000,        LENGTH = 0x110
-  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0x255F0
+  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0x252F0
 }
 
 INCLUDE ../blapi/app_BLAPI_3.gld

firmware/blapi/app_IOIO0021.gld

@@ -15,7 +15,7 @@ MEMORY
 {
   data  (a!xr)   : ORIGIN = 0x800,         LENGTH = 0x6000
   app_ivt        : ORIGIN = 0x5000,        LENGTH = 0x110
-  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0x101F0
+  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0xFEF0
 }
 
 INCLUDE ../blapi/app_BLAPI_3.gld

firmware/blapi/app_IOIO0022.gld

@@ -15,7 +15,7 @@ MEMORY
 {
   data  (a!xr)   : ORIGIN = 0x800,         LENGTH = 0x17800
   app_ivt        : ORIGIN = 0x5000,        LENGTH = 0x110
-  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0x101F0
+  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0xFEF0
 }
 
 INCLUDE ../blapi/app_BLAPI_3.gld

firmware/blapi/app_IOIO0023.gld

@@ -15,7 +15,7 @@ MEMORY
 {
   data  (a!xr)   : ORIGIN = 0x800,         LENGTH = 0x17800
   app_ivt        : ORIGIN = 0x5000,        LENGTH = 0x110
-  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0x255F0
+  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0x252F0
 }
 
 INCLUDE ../blapi/app_BLAPI_3.gld

firmware/blapi/app_IOIO0030.gld

@@ -15,7 +15,7 @@ MEMORY
 {
   data  (a!xr)   : ORIGIN = 0x800,         LENGTH = 0x17800
   app_ivt        : ORIGIN = 0x5000,        LENGTH = 0x110
-  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0x255F0
+  program (xr)   : ORIGIN = 0x5110,        LENGTH = 0x252F0
 }
 
 INCLUDE ../blapi/app_BLAPI_3.gld

firmware/bootloader/version.c

@@ -33,4 +33,4 @@ struct {
   const char hardware[8];
   const char bootloader[8];
 } _version __attribute__((section("version.sec"), space(psv)))
-    = { HW_IMPL_VER, "IOIO0311" };
+    = { HW_IMPL_VER, "IOIO0312" };

firmware/bootloader_common/bootloader_defs.h

@@ -42,11 +42,15 @@
 
 #define FORCEROM __attribute__((space(auto_psv)))
 
+#define PAGE_SIZE 0x400
+#define PAGE_START(address) ((address) & ~(PAGE_SIZE - 1))
+
 #define BOOTLOADER_MIN_APP_ADDRESS 0x5000
-#define BOOTLOADER_MAX_APP_ADDRESS (APP_PROGSPACE_END - 0x100)  // last page reseved for fingerprint
-#define BOOTLOADER_FINGERPRINT_ADDRESS BOOTLOADER_MAX_APP_ADDRESS
+// last page reseved for bootloader configuration
+#define BOOTLOADER_MAX_APP_ADDRESS (PAGE_START(APP_PROGSPACE_END) - PAGE_SIZE)
+#define BOOTLOADER_CONFIG_PAGE BOOTLOADER_MAX_APP_ADDRESS
+#define BOOTLOADER_FINGERPRINT_ADDRESS BOOTLOADER_CONFIG_PAGE
 #define BOOTLOADER_OSCTUN_ADDRESS (BOOTLOADER_FINGERPRINT_ADDRESS + 16)
-#define BOOTLOADER_CONFIG_PAGE (BOOTLOADER_MAX_APP_ADDRESS & 0xFFFFF400)
 #define BOOTLOADER_INVALID_ADDRESS ((DWORD) -1)
 
 static const char manager_app_name[] = "ioio.manager";

firmware/device_bootloader/version.c

@@ -33,4 +33,4 @@ struct {
   const char hardware[8];
   const char bootloader[8];
 } _version __attribute__((section("version.sec"), space(psv)))
-    = { HW_IMPL_VER, "IOIO0400" };
+    = { HW_IMPL_VER, "IOIO0401" };