M2351: Polish memory partition code

1.  Refine memory partition files to support different toolchains
2.  Exclude NSC region from flash IAP range

Author: ccli8

targets/TARGET_NUVOTON/TARGET_M2351/device/cmsis.h

@@ -23,8 +23,8 @@
 #include "partition_M2351.h"
 
 /* Check relevant macro has been defined */
-#if (! defined(NU_TZ_SECURE_FLASH_SIZE))
-#error("NU_TZ_SECURE_FLASH_SIZE not defined")
+#if (! defined(NU_ROM_SIZE_S))
+#error("NU_ROM_SIZE_S not defined")
 #endif
 
 // Support linker-generated symbol as start of relocated vector table.
@@ -38,7 +38,7 @@ extern uint32_t __start_vector_table__;
 
 /* TZ_START_NS: Start address of non-secure application */
 #ifndef TZ_START_NS
-#define TZ_START_NS (NS_OFFSET + NU_TZ_SECURE_FLASH_SIZE)
+#define TZ_START_NS (NS_OFFSET + NU_ROM_SIZE_S)
 #endif
 
 #endif

targets/TARGET_NUVOTON/TARGET_M2351/device/partition_M2351.h

@@ -21,48 +21,31 @@
 
 #include "partition_M2351_mem.h"
 
-#define NU_TZ_SECURE_FLASH_SIZE     NU_ROM_SIZE_S
-#define NU_TZ_SECURE_SRAM_SIZE      NU_RAM_SIZE_S
-
-#if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050))
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
-extern int Load$$LR$$LR_IROM_NSC$$Base;
-extern int Load$$LR$$LR_IROM_NSC$$Length;
+#if defined(__ARMCC_VERSION)
 
-#define NU_TZ_NSC_REGION_START  ((uint32_t) &Load$$LR$$LR_IROM_NSC$$Base)
-#define NU_TZ_NSC_REGION_SIZE   ((uint32_t) &Load$$LR$$LR_IROM_NSC$$Length)
+extern int Image$$ER_IROM_NSC$$Base;
+#define NU_TZ_NSC_REGION_START  ((uint32_t) &Image$$ER_IROM_NSC$$Base)
+#define NU_TZ_NSC_REGION_SIZE   (NU_TZ_NSC_SIZE)
 
 #elif defined(__ICCARM__)
 
-extern int __NU_TZ_NSC_start__;
-extern int __NU_TZ_NSC_size__;
-
-#define NU_TZ_NSC_REGION_START  ((uint32_t) &__NU_TZ_NSC_start__)
-#define NU_TZ_NSC_REGION_SIZE   ((uint32_t) &__NU_TZ_NSC_size__)
+extern int Image$$ER_IROM_NSC$$Base;
+#define NU_TZ_NSC_REGION_START  ((uint32_t) &Image$$ER_IROM_NSC$$Base)
+#define NU_TZ_NSC_REGION_SIZE   (NU_TZ_NSC_SIZE)
 
 #elif defined(__GNUC__)
 
-extern int __nu_tz_nsc_start;
-extern int __nu_tz_nsc_size;
-
-#define NU_TZ_NSC_REGION_START  ((uint32_t) &__nu_tz_nsc_start)
-#define NU_TZ_NSC_REGION_SIZE   ((uint32_t) &__nu_tz_nsc_size)
+extern int Image$$ER_IROM_NSC$$Base;
+#define NU_TZ_NSC_REGION_START  ((uint32_t) &Image$$ER_IROM_NSC$$Base)
+#define NU_TZ_NSC_REGION_SIZE   (NU_TZ_NSC_SIZE)
 
 #endif
 
-/* Check relevant macros have been defined */
-#if (! defined(NU_TZ_SECURE_FLASH_SIZE))
-#error("NU_TZ_SECURE_FLASH_SIZE not defined")
-#endif
-#if (! defined(NU_TZ_SECURE_SRAM_SIZE))
-#error("NU_TZ_SECURE_SRAM_SIZE not defined")
-#endif
-#if (! defined(NU_TZ_NSC_REGION_START))
-#error("NU_TZ_NSC_REGION_START not defined")
-#endif
-#if (! defined(NU_TZ_NSC_REGION_SIZE))
-#error("NU_TZ_NSC_REGION_SIZE not defined")
-#endif
 
 /*
 //-------- <<< Use Configuration Wizard in Context Menu >>> -----------------
@@ -88,7 +71,7 @@ extern int __nu_tz_nsc_size;
 //                                         <0x16000=> 88KB
 //                                         <0x18000=> 96KB
 */
-#define SCU_SECURE_SRAM_SIZE      NU_TZ_SECURE_SRAM_SIZE
+#define SCU_SECURE_SRAM_SIZE    NU_RAM_SIZE_S
 #define NON_SECURE_SRAM_BASE    (0x30000000 + SCU_SECURE_SRAM_SIZE)
 
 
@@ -103,7 +86,7 @@ extern int __nu_tz_nsc_size;
 //     <o>Secure Flash ROM Size <0x800-0x7FFFF:0x800>
 */
 
-#define FMC_SECURE_ROM_SIZE      NU_TZ_SECURE_FLASH_SIZE
+#define FMC_SECURE_ROM_SIZE      NU_ROM_SIZE_S
 
 #define FMC_NON_SECURE_BASE     (0x10000000 + FMC_SECURE_ROM_SIZE)
 
@@ -867,5 +850,9 @@ __STATIC_INLINE void TZ_SAU_Setup(void)
 
 #endif  /* #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* PARTITION_M2351 */
 

targets/TARGET_NUVOTON/TARGET_M2351/device/partition_M2351_mem.h

@@ -19,12 +19,18 @@
 #ifndef __PARTITION_M2351_MEM_H__
 #define __PARTITION_M2351_MEM_H__
 
-/* About partition_M2351_mem.h/partition_M2351_mem.icf
+/* About partition_M2351_mem.h/partition_M2351_mem.icf.h
  *
  * 1. partition_M2351_mem.h is created for centralizing memory partition configuration. It will be
  *    included by C/C++ files and linker files (except IAR linker file).
- * 2. IAR linker doesn't support preprocessor, so partition_M2351_mem.icf, duplicate of partition_M2351_mem.h
+ * 2. IAR linker doesn't support preprocessor, so partition_M2351_mem.icf.h, duplicate of partition_M2351_mem.h
  *    is created for IAR linker file.
+ * 3. To continue above, we name partition_M2351_mem.icf.h instead of partition_M2351_mem.icf because:
+ *    (1) Mbed OS build tool may mis-regard partition_M2351_mem.icf as the main linker configuration file.
+ *    (2) *.icf files may not be present in search directories for "include" directive. Per observation,
+ *        the search directories are inconsistent among normal example build and test code build. To address
+ *        it, we name partition_M2351_mem.icf.h instead because *.h files are always present in these builds
+ *       (already there or via copy).
  */
 
 /* Default flash/SRAM partition
@@ -39,34 +45,38 @@
  */
 #if defined(DOMAIN_NS) && DOMAIN_NS
 
-/* Default non-secure ROM layout */
+/* Resolve non-secure ROM start */
 #ifndef MBED_ROM_START
 #define MBED_ROM_START          (0x10040000)
 #endif
+/* Resolve non-secure ROM size */
 #ifndef MBED_ROM_SIZE
 #define MBED_ROM_SIZE           (0x40000)
 #endif
-/* Default non-secure RAM layout */
+/* Resolve non-secure RAM start */
 #ifndef MBED_RAM_START
 #define MBED_RAM_START          (0x30008000)
 #endif
+/* Resolve non-secure RAM size */
 #ifndef MBED_RAM_SIZE
 #define MBED_RAM_SIZE           (0x10000)
 #endif
 
 #else
 
-/* Default secure ROM layout */
+/* Resolve secure ROM start */
 #ifndef MBED_ROM_START
 #define MBED_ROM_START          (0x0)
 #endif
+/* Resolve secure ROM size */
 #ifndef MBED_ROM_SIZE
 #define MBED_ROM_SIZE           (0x40000)
 #endif
-/* Default secure RAM layout */
+/* Resolve secure RAM start */
 #ifndef MBED_RAM_START
 #define MBED_RAM_START          (0x20000000)
 #endif
+/* Resolve secure RAM size */
 #ifndef MBED_RAM_SIZE
 #define MBED_RAM_SIZE           (0x8000)
 #endif
@@ -108,4 +118,108 @@
 
 #endif
 
+/* Mbed build tool passes just APPLICATION_xxx macros to C/C++ files and just
+ * MBED_APP_xxx macros to linker files even though they mean the same thing.
+ * Because this file is to include by both C/C++ files and linker files, we add
+ * these macros according to the others for consistency when they are missing
+ * in compile or link stage. */
+
+#ifndef APPLICATION_ADDR
+#ifdef MBED_APP_START
+#define APPLICATION_ADDR        MBED_APP_START
+#else
+#define APPLICATION_ADDR        MBED_ROM_START
+#endif
+#endif
+
+#ifndef APPLICATION_SIZE
+#ifdef MBED_APP_SIZE
+#define APPLICATION_SIZE        MBED_APP_SIZE
+#else
+#define APPLICATION_SIZE        MBED_ROM_SIZE
+#endif
+#endif
+
+#ifndef APPLICATION_RAM_ADDR
+#ifdef MBED_RAM_APP_START
+#define APPLICATION_RAM_ADDR    MBED_RAM_APP_START
+#else
+#define APPLICATION_RAM_ADDR    MBED_RAM_START
+#endif
+#endif
+
+#ifndef APPLICATION_RAM_SIZE
+#ifdef MBED_RAM_APP_SIZE
+#define APPLICATION_RAM_SIZE    MBED_RAM_APP_SIZE
+#else
+#define APPLICATION_RAM_SIZE    MBED_RAM_SIZE
+#endif
+#endif
+
+#ifndef MBED_APP_START
+#define MBED_APP_START          APPLICATION_ADDR
+#endif
+
+#ifndef MBED_APP_SIZE
+#define MBED_APP_SIZE           APPLICATION_SIZE
+#endif
+
+#ifndef MBED_RAM_APP_START
+#define MBED_RAM_APP_START      APPLICATION_RAM_ADDR
+#endif
+
+#ifndef MBED_RAM_APP_SIZE
+#define MBED_RAM_APP_SIZE       APPLICATION_RAM_SIZE
+#endif
+
+#if (APPLICATION_ADDR != MBED_APP_START)
+#error("APPLICATION_ADDR and MBED_APP_START are not the same!!!")
+#endif
+
+#if (APPLICATION_SIZE != MBED_APP_SIZE)
+#error("APPLICATION_SIZE and MBED_APP_SIZE are not the same!!!")
+#endif
+
+#if (APPLICATION_RAM_ADDR != MBED_RAM_APP_START)
+#error("APPLICATION_RAM_ADDR and MBED_RAM_APP_START are not the same!!!")
+#endif
+
+#if (APPLICATION_RAM_SIZE != MBED_RAM_APP_SIZE)
+#error("APPLICATION_RAM_SIZE and MBED_RAM_APP_SIZE are not the same!!!")
+#endif
+
+/* Determine NSC area
+ *
+ * Requirements for NSC area:
+ * 1. Requested by SAU, NSC area must start at 32 byte-aligned boundary.
+ * 2. By IDAU, 0~0x4000 is secure. NSC can only locate in 0x4000~0x10000000.
+ * 3. Greentea flash IAP uses last 2 sectors for its test. Avoid this range.
+ * 4. Greentea NVSTORE uses last 2 sectors or 4 KiB x 2 for its test. Avoid this range.
+ * 5. KVStore uses last a few KiB. Avoid this range.
+ * 6. Due to TFM build process, TFM and its tests must generate the same cmse_lib.o.
+ *    To this end, TZ NSC location must fix at a well-known location and cannot place
+ *    arbitrarily.
+ *
+ * Configurable for NSC area:
+ * We cannot configure NSC location via configuration parameter because the generated
+ * configuration macros are just passed to C/C++ files but not to linker files. So
+ * we can only hardcode NSC location here as constants (to be included by linker file).
+ *
+ * Locate NSC area at end of secure flash:
+ * We decide to locate NSC area at end of secure flash. To avoid this area
+ * accidentally erased by flash IAP operation, flash IAP must configure to exclude
+ * this area.
+ */
+/* TZ NSC area defaults to from secure ROM end */
+#define NU_TZ_NSC_START     (NU_ROM_START_S + NU_ROM_SIZE_S - NU_TZ_NSC_SIZE)
+/* TZ NSC area defaults to 4KiB. */
+#define NU_TZ_NSC_SIZE      0x1000
+
+/* Configuration of flash IAP area */
+#define NU_FLASHIAP_SECURE_START        NU_ROM_START_S
+/* Exclude NSC area to avoid accidentally erased */
+#define NU_FLASHIAP_SECURE_SIZE         (NU_ROM_SIZE_S - NU_TZ_NSC_SIZE)
+#define NU_FLASHIAP_NONSECURE_START     NU_ROM_START_NS
+#define NU_FLASHIAP_NONSECURE_SIZE      NU_ROM_SIZE_NS
+
 #endif  /* __PARTITION_M2351_MEM_H__ */