Revert "fix(CMSIS): Reduce Available MAX32670 Flash by 8KB, Reserve F…

…inal Page for Bootloader (#968)" This reverts commit 8ed11c0.
analogdevicesinc · Aug 21, 2024 · ba11c7a · ba11c7a
1 parent f313aeb
commit ba11c7a
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 13 deletions.
diff --git a/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk b/Libraries/CMSIS/Device/Maxim/GCC/mxc_version.mk
@@ -16,7 +16,7 @@
  #
  ##############################################################################
 # Autogenerated version info for build system.
-MSDK_VERSION_STRING := v2024_02-25-g3a91bd6c4a
+MSDK_VERSION_STRING := v2024_02-22-g61823d75cf
 MSDK_VERSION_YEAR := 2024
 MSDK_VERSION_MONTH := 2
 

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Include/max32670.h b/Libraries/CMSIS/Device/Maxim/MAX32670/Include/max32670.h
@@ -197,9 +197,7 @@ typedef enum {
 #define MXC_FLASH0_MEM_BASE 0x10000000UL
 #define MXC_FLASH_MEM_BASE MXC_FLASH0_MEM_BASE
 #define MXC_FLASH_PAGE_SIZE 0x00002000UL
-#define MXC_FLASH_MEM_SIZE (0x00060000UL - MXC_FLASH_PAGE_SIZE)
-// ^ Last page of flash is used by the bootloader and cannot be used by app code.
-// Furthermore, it appears that using this page will brick the device...
+#define MXC_FLASH_MEM_SIZE 0x00060000UL
 #define MXC_INFO0_MEM_BASE 0x10800000UL
 #define MXC_INFO_MEM_BASE MXC_INFO0_MEM_BASE
 #define MXC_INFO_MEM_SIZE 0x00004000UL

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670.ld b/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670.ld
@@ -19,7 +19,7 @@
  ******************************************************************************/
 
 MEMORY {
-    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 376K /* 384kB "FLASH" - reserved last page used by bootloader */
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 384K /* 384kB "FLASH" */
     SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K /* 160kB SRAM with ECC*/
     /*^ If ECC is enabled, the stack size must be reduced.  Otherwise, a
         HardFault will occur on startup as the stack is expanded into the

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_emulator.ld b/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_emulator.ld
@@ -20,7 +20,7 @@
 
 MEMORY {
     ROM (rx)   : ORIGIN = 0x00000000, LENGTH = 0x00020000 /* 128kB "ROM" */
-    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 376K /* 384kB "FLASH" - reserved last page used by bootloader */
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 384K /* 256kB "FLASH" */
     SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 160K /* 760kB SRAM */
 }
 

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_emulator_ram.ld b/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_emulator_ram.ld
@@ -20,7 +20,7 @@
 
 MEMORY {
     ROM (rx)   : ORIGIN = 0x00000000, LENGTH = 0x00020000 /* 128kB "ROM" */
-    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 376K /* 384kB "FLASH" - reserved last page used by bootloader */
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 384K /* 256kB "FLASH" */
     SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 160K /* 608kB SRAM */
 }
 

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_emulator_spix.ld b/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_emulator_spix.ld
@@ -20,7 +20,7 @@
 
 MEMORY {
     ROM (rx)   : ORIGIN = 0x00000000, LENGTH = 0x00020000 /* 128kB "ROM" */
-    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 376K /* 384kB "FLASH" - reserved last page used by bootloader */
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 0x00040000 /* 256kB "FLASH" */
     SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x000BE000 /* 760kB SRAM */
 
     XIP_0 (rx)   : ORIGIN = 0x08000000, LENGTH = 0x00010000

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_emulator_xip.ld b/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_emulator_xip.ld
@@ -20,7 +20,7 @@
 
 MEMORY {
     ROM (rx)   : ORIGIN = 0x00000000, LENGTH = 0x00020000 /* 128kB "ROM" */
-    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 376K /* 384kB "FLASH" - reserved last page used by bootloader */
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 0x00040000 /* 256kB "FLASH" */
     XIP (rx) : ORIGIN = 0x08000000, LENGTH = 0x00100000 /* 1MB XIP Flash */
     SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x000BE000 /* 760kB SRAM */
 }

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_ram.ld b/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_ram.ld
@@ -20,7 +20,7 @@
 
 MEMORY {
     ROM (rx)   : ORIGIN = 0x00000000, LENGTH = 0x00020000 /* 128kB ROM */
-    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 376K /* 384kB "FLASH" - reserved last page used by bootloader */
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 384K /* 384kB "FLASH" */
     SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K /* 160kB SRAM with ECC*/
     /*^ If ECC is enabled, the stack size must be reduced.  Otherwise, a
         HardFault will occur on startup as the stack is expanded into the

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_rom.ld b/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_rom.ld
@@ -19,7 +19,7 @@
  ******************************************************************************/
 
 MEMORY {
-    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 376K /* 384kB "FLASH" - reserved last page used by bootloader */
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 384K /* 256kB "FLASH" */
     /* 152Kx32 total size of RAMS 0-10 (608Kbytes). */
     /* 38Kx32 total size of RAMs 11-21 for optional ECC (152Kbytes) */
     /* NOTE 1: The MAX32570 has Error correcting RAM which removes 152KByte of usable RAM from the memory map. */

diff --git a/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_spix.ld b/Libraries/CMSIS/Device/Maxim/MAX32670/Source/GCC/max32670_spix.ld
@@ -19,7 +19,7 @@
  ******************************************************************************/
 MEMORY {
     ROM (rx)   : ORIGIN = 0x00000000, LENGTH = 0x00020000 /* 128kB ROM */
-    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 376K /* 384kB "FLASH" - reserved last page used by bootloader */
+    FLASH (rx) : ORIGIN = 0x10000000, LENGTH = 384K /* 384kB "FLASH" */
     SRAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K /* 160kB SRAM with ECC*/
     /*^ If ECC is enabled, the stack size must be reduced.  Otherwise, a
         HardFault will occur on startup as the stack is expanded into the

diff --git a/mxc_version.h b/mxc_version.h
@@ -24,7 +24,7 @@
  * Format: `[Release tag]-[commits since release tag]-g[commit SHA]`
  * If exactly on a release tag, this string will match the tag
  */
-#define MSDK_VERSION_STRING "v2024_02-25-g3a91bd6c4a"
+#define MSDK_VERSION_STRING "v2024_02-22-g61823d75cf"
 /**
  * @brief The month of the current MSDK version
  */