arch: Prefer `FMW_` prefix to `FIRMWARE_`

In line with the prefix traditionally used across the project, the
"FIRMWARE_" prefix has been replaced with "FMW_" in the architecture
library.

Change-Id: Ib57a7a290d5f361882c19108171131e1d0df0ba7
Signed-off-by: Chris Kay <chris.kay@arm.com>

32 files changed, 211 insertions, 212 deletions

diff --git a/arch/src/armv7-m/ld.S b/arch/src/armv7-m/ld.S
index e74115e7..c7cfe00d 100644
--- a/arch/src/armv7-m/ld.S
+++ b/arch/src/armv7-m/ld.S
@@ -13,7 +13,7 @@
 ENTRY(arch_exception_reset)
 
 MEMORY {
-#if FIRMWARE_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION
+#if FMW_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION
     /*
      * Single region memory layout:
      *  - MEM0 accepts:
@@ -22,8 +22,8 @@ MEMORY {
      *      - Executable sections
      */
 
-    mem0 (rwx) : ORIGIN = FIRMWARE_MEM0_BASE, LENGTH = FIRMWARE_MEM0_SIZE
-#elif FIRMWARE_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_RELOCATION
+    mem0 (rwx) : ORIGIN = FMW_MEM0_BASE, LENGTH = FMW_MEM0_SIZE
+#elif FMW_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_RELOCATION
     /*
      * Dual region memory layout with initialized data relocation:
      *  - MEM0 accepts:
@@ -34,9 +34,9 @@ MEMORY {
      *      - Read-write sections
      */
 
-    mem0 (rx) : ORIGIN = FIRMWARE_MEM0_BASE, LENGTH = FIRMWARE_MEM0_SIZE
-    mem1 (w) : ORIGIN = FIRMWARE_MEM1_BASE, LENGTH = FIRMWARE_MEM1_SIZE
-#elif FIRMWARE_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION
+    mem0 (rx) : ORIGIN = FMW_MEM0_BASE, LENGTH = FMW_MEM0_SIZE
+    mem1 (w) : ORIGIN = FMW_MEM1_BASE, LENGTH = FMW_MEM1_SIZE
+#elif FMW_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION
     /*
      * Dual region memory layout without initialized data relocation:
      *  - MEM0 accepts:
@@ -47,20 +47,20 @@ MEMORY {
      *      - Read-write sections
      */
 
-    mem0 (x) : ORIGIN = FIRMWARE_MEM0_BASE, LENGTH = FIRMWARE_MEM0_SIZE
-    mem1 (rw) : ORIGIN = FIRMWARE_MEM1_BASE, LENGTH = FIRMWARE_MEM1_SIZE
+    mem0 (x) : ORIGIN = FMW_MEM0_BASE, LENGTH = FMW_MEM0_SIZE
+    mem1 (rw) : ORIGIN = FMW_MEM1_BASE, LENGTH = FMW_MEM1_SIZE
 #endif
 }
 
-#if FIRMWARE_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION
+#if FMW_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION
     REGION_ALIAS("r", mem0);
     REGION_ALIAS("w", mem0);
     REGION_ALIAS("x", mem0);
-#elif FIRMWARE_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#elif FMW_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_RELOCATION
     REGION_ALIAS("r", mem0);
     REGION_ALIAS("w", mem1);
     REGION_ALIAS("x", mem0);
-#elif FIRMWARE_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION
+#elif FMW_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION
     REGION_ALIAS("r", mem1);
     REGION_ALIAS("w", mem1);
     REGION_ALIAS("x", mem0);
diff --git a/arch/src/armv7-m/scatter.S b/arch/src/armv7-m/scatter.S
index 6fdfc1ed..2a472123 100644
--- a/arch/src/armv7-m/scatter.S
+++ b/arch/src/armv7-m/scatter.S
@@ -10,34 +10,34 @@
 
 #include "scatter.h"
 
-#if FIRMWARE_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION
-    /*
-     * Single region memory layout:
-     *  - MEM0 accepts:
-     *      - Read-only sections
-     *      - Read-write sections
-     *      - Executable sections
-     */
+#if FMW_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION
+/*
+ * Single region memory layout:
+ *  - MEM0 accepts:
+ *      - Read-only sections
+ *      - Read-write sections
+ *      - Executable sections
+ */
 
-    #define FIRMWARE_X_BASE +0
-    #define FIRMWARE_R_BASE +0
-    #define FIRMWARE_W_BASE +0
-#elif FIRMWARE_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_RELOCATION
-    /*
-     * Dual region memory layout with initialized data relocation:
-     *  - MEM0 accepts:
-     *      - Read-only sections
-     *      - Executable sections
-     *
-     *  - MEM1 accepts:
-     *      - Read-write sections
-     */
+#    define FMW_X_BASE +0
+#    define FMW_R_BASE +0
+#    define FMW_W_BASE +0
+#elif FMW_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_RELOCATION
+/*
+ * Dual region memory layout with initialized data relocation:
+ *  - MEM0 accepts:
+ *      - Read-only sections
+ *      - Executable sections
+ *
+ *  - MEM1 accepts:
+ *      - Read-write sections
+ */
 
-    #define FIRMWARE_X_BASE +0
-    #define FIRMWARE_R_BASE +0
+#    define FMW_X_BASE +0
+#    define FMW_R_BASE +0
 
-    #define FIRMWARE_W_BASE FIRMWARE_MEM1_BASE
-#elif FIRMWARE_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION
+#    define FMW_W_BASE FMW_MEM1_BASE
+#elif FMW_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION
     /*
      * Dual region memory layout without initialized data relocation:
      *  - MEM0 accepts:
@@ -48,20 +48,20 @@
      *      - Read-write sections
      */
 
-    #define FIRMWARE_X_BASE +0
+#    define FMW_X_BASE +0
 
-    #define FIRMWARE_R_BASE FIRMWARE_MEM1_BASE
-    #define FIRMWARE_W_BASE +0
+#    define FMW_R_BASE FMW_MEM1_BASE
+#    define FMW_W_BASE +0
 #endif
 
-#if FIRMWARE_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION
-    #define FIRMWARE_W_LIMIT FIRMWARE_MEM0_LIMIT
+#if FMW_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION
+#    define FMW_W_LIMIT FMW_MEM0_LIMIT
 #else
-    #define FIRMWARE_W_LIMIT FIRMWARE_MEM1_LIMIT
+#    define FMW_W_LIMIT FMW_MEM1_LIMIT
 #endif
 
-LR_FIRMWARE FIRMWARE_MEM0_BASE {
-    ER_EXCEPTIONS FIRMWARE_X_BASE {
+LR_FIRMWARE FMW_MEM0_BASE {
+    ER_EXCEPTIONS FMW_X_BASE {
         *(.exceptions)
     }
 
@@ -69,11 +69,11 @@ LR_FIRMWARE FIRMWARE_MEM0_BASE {
         *(+CODE)
     }
 
-    ER_RODATA FIRMWARE_R_BASE {
+    ER_RODATA FMW_R_BASE {
         *(+CONST)
     }
 
-    ER_DATA FIRMWARE_W_BASE {
+    ER_DATA FMW_W_BASE {
         *(+DATA)
     }
 
@@ -81,5 +81,5 @@ LR_FIRMWARE FIRMWARE_MEM0_BASE {
         *(+BSS)
     }
 
-    ARM_LIB_STACKHEAP +0 EMPTY (FIRMWARE_W_LIMIT - +0) { }
+    ARM_LIB_STACKHEAP +0 EMPTY (FMW_W_LIMIT - +0) { }
 }
diff --git a/arch/src/armv7-m/scatter.h b/arch/src/armv7-m/scatter.h
index 8499808d..df0ec6c2 100644
--- a/arch/src/armv7-m/scatter.h
+++ b/arch/src/armv7-m/scatter.h
@@ -37,34 +37,34 @@
 
 #include <fmw_memory.h>
 
-#ifndef FIRMWARE_MEM_MODE
-    #error "FIRMWARE_MEM_MODE has not been configured"
+#ifndef FMW_MEM_MODE
+#    error "FMW_MEM_MODE has not been configured"
 #endif
 
-#if (FIRMWARE_MEM_MODE != FWK_MEM_MODE_SINGLE_REGION) && \
-    (FIRMWARE_MEM_MODE != FWK_MEM_MODE_DUAL_REGION_RELOCATION) && \
-    (FIRMWARE_MEM_MODE != FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION)
-    #error "FIRMWARE_MEM_MODE has been configured improperly"
+#if (FMW_MEM_MODE != FWK_MEM_MODE_SINGLE_REGION) && \
+    (FMW_MEM_MODE != FWK_MEM_MODE_DUAL_REGION_RELOCATION) && \
+    (FMW_MEM_MODE != FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION)
+#    error "FMW_MEM_MODE has been configured improperly"
 #endif
 
-#ifndef FIRMWARE_MEM0_BASE
-    #error "FIRMWARE_MEM0_BASE has not been configured"
+#ifndef FMW_MEM0_BASE
+#    error "FMW_MEM0_BASE has not been configured"
 #endif
 
-#ifndef FIRMWARE_MEM0_SIZE
-    #error "FIRMWARE_MEM0_SIZE has not been configured"
+#ifndef FMW_MEM0_SIZE
+#    error "FMW_MEM0_SIZE has not been configured"
 #endif
 
-#define FIRMWARE_MEM0_LIMIT (FIRMWARE_MEM0_BASE + FIRMWARE_MEM0_SIZE)
+#define FMW_MEM0_LIMIT (FMW_MEM0_BASE + FMW_MEM0_SIZE)
 
-#if FIRMWARE_MEM_MODE != FWK_MEM_MODE_SINGLE_REGION
-    #ifndef FIRMWARE_MEM1_BASE
-        #error "FIRMWARE_MEM1_BASE has not been configured"
-    #endif
+#if FMW_MEM_MODE != FWK_MEM_MODE_SINGLE_REGION
+#    ifndef FMW_MEM1_BASE
+#        error "FMW_MEM1_BASE has not been configured"
+#    endif
 
-    #ifndef FIRMWARE_MEM1_SIZE
-        #error "FIRMWARE_MEM1_SIZE has not been configured"
-    #endif
+#    ifndef FMW_MEM1_SIZE
+#        error "FMW_MEM1_SIZE has not been configured"
+#    endif
 
-    #define FIRMWARE_MEM1_LIMIT (FIRMWARE_MEM1_BASE + FIRMWARE_MEM1_SIZE)
+#    define FMW_MEM1_LIMIT (FMW_MEM1_BASE + FMW_MEM1_SIZE)
 #endif
diff --git a/doc/framework.md b/doc/framework.md
index 82a6f859..2b0e207a 100644
--- a/doc/framework.md
+++ b/doc/framework.md
@@ -68,20 +68,19 @@ data for each of these modules.
 
 For each firmware, linker information must be provided in a *fmw_memory.h* file:
 
-- FIRMWARE_MEM_MODE: The desired memory region configuration. Can be one of the
-    following:
+- FMW_MEM_MODE: The desired memory region configuration. Can be one of the
+  following:
     - FWK_MEM_MODE_SINGLE_REGION
     - FWK_MEM_MODE_DUAL_REGION_RELOCATION
     - FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION
-- FIRMWARE_MEM0_BASE: The base address of the MEM0 region, which is always
-    used regardless of the memory region configuration given by
-    *FIRMWARE_MEM_MODE*.
-- FIRMWARE_MEM0_SIZE: The size of the MEM0 region in bytes.
-- FIRMWARE_STACK_SIZE (if multithreading enabled): The size of each individual
-    thread stack in bytes.
-
-If a dual-region memory configuration is used then *FIRMWARE_MEM1_BASE* and
-*FIRMWARE_MEM1_SIZE* must also be defined.
+- FMW_MEM0_BASE: The base address of the MEM0 region, which is always
+  used regardless of the memory region configuration given by *FMW_MEM_MODE*.
+- FMW_MEM0_SIZE: The size of the MEM0 region in bytes.
+- FMW_STACK_SIZE (if multithreading enabled): The size of each individual
+  thread stack in bytes.
+
+If a dual-region memory configuration is used then *FMW_MEM1_BASE* and
+*FMW_MEM1_SIZE* must also be defined.
 
 It is the responsibility of the firmware to define - in its Makefile - the
 architecture target for the image (using *BS_FIRMWARE_CPU*) and whether the
diff --git a/framework/src/fwk_multi_thread.c b/framework/src/fwk_multi_thread.c
index 9a30caac..faa0c121 100644
--- a/framework/src/fwk_multi_thread.c
+++ b/framework/src/fwk_multi_thread.c
@@ -37,8 +37,8 @@
 #    include <fmw_memory.h>
 #endif
 
-#ifndef FIRMWARE_STACK_SIZE
-#    define FIRMWARE_STACK_SIZE 1536
+#ifndef FMW_STACK_SIZE
+#    define FMW_STACK_SIZE 1536
 #endif
 
 #define SIGNAL_ISR_EVENT 0x01
@@ -70,7 +70,7 @@ static int init_thread_attr(osThreadAttr_t *attr)
     attr->cb_size = osRtxThreadCbSize;
     attr->cb_mem = fwk_mm_calloc(1, attr->cb_size);
 
-    attr->stack_size = FIRMWARE_STACK_SIZE;
+    attr->stack_size = FMW_STACK_SIZE;
     attr->stack_mem = fwk_mm_calloc(1, attr->stack_size);
 
     attr->priority = osPriorityNormal;
diff --git a/product/juno/scp_ramfw/fmw_memory.h b/product/juno/scp_ramfw/fmw_memory.h
index 11b2cf37..a2083b3f 100644
--- a/product/juno/scp_ramfw/fmw_memory.h
+++ b/product/juno/scp_ramfw/fmw_memory.h
@@ -10,10 +10,10 @@
 
 #include "scp_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_SINGLE_REGION
+#define FMW_MEM_MODE FWK_MEM_MODE_SINGLE_REGION
 
 /* RAM */
-#define FIRMWARE_MEM0_SIZE SCP_RAM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_RAM_BASE
+#define FMW_MEM0_SIZE SCP_RAM_SIZE
+#define FMW_MEM0_BASE SCP_RAM_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/juno/scp_romfw/fmw_memory.h b/product/juno/scp_romfw/fmw_memory.h
index 4cccc6a7..e03a291b 100644
--- a/product/juno/scp_romfw/fmw_memory.h
+++ b/product/juno/scp_romfw/fmw_memory.h
@@ -10,14 +10,14 @@
 
 #include "scp_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /* ROM */
-#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
+#define FMW_MEM0_SIZE SCP_ROM_SIZE
+#define FMW_MEM0_BASE SCP_ROM_BASE
 
 /* RAM */
-#define FIRMWARE_MEM1_SIZE (16 * 1024)
-#define FIRMWARE_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FIRMWARE_MEM1_SIZE)
+#define FMW_MEM1_SIZE (16 * 1024)
+#define FMW_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FMW_MEM1_SIZE)
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/juno/scp_romfw_bypass/fmw_memory.h b/product/juno/scp_romfw_bypass/fmw_memory.h
index 4cccc6a7..e03a291b 100644
--- a/product/juno/scp_romfw_bypass/fmw_memory.h
+++ b/product/juno/scp_romfw_bypass/fmw_memory.h
@@ -10,14 +10,14 @@
 
 #include "scp_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /* ROM */
-#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
+#define FMW_MEM0_SIZE SCP_ROM_SIZE
+#define FMW_MEM0_BASE SCP_ROM_BASE
 
 /* RAM */
-#define FIRMWARE_MEM1_SIZE (16 * 1024)
-#define FIRMWARE_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FIRMWARE_MEM1_SIZE)
+#define FMW_MEM1_SIZE (16 * 1024)
+#define FMW_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FMW_MEM1_SIZE)
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/n1sdp/mcp_ramfw/fmw_memory.h b/product/n1sdp/mcp_ramfw/fmw_memory.h
index 65e1d2e7..e2a35171 100644
--- a/product/n1sdp/mcp_ramfw/fmw_memory.h
+++ b/product/n1sdp/mcp_ramfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "n1sdp_mcp_system_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE MCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE MCP_RAM0_BASE
+#define FMW_MEM0_SIZE MCP_RAM0_SIZE
+#define FMW_MEM0_BASE MCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
+#define FMW_MEM1_SIZE MCP_RAM1_SIZE
+#define FMW_MEM1_BASE MCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/n1sdp/mcp_romfw/fmw_memory.h b/product/n1sdp/mcp_romfw/fmw_memory.h
index 1f1b41ba..23cdcb00 100644
--- a/product/n1sdp/mcp_romfw/fmw_memory.h
+++ b/product/n1sdp/mcp_romfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "n1sdp_mcp_system_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE MCP_BACKUP_DDR3_SIZE
-#define FIRMWARE_MEM0_BASE MCP_BACKUP_DDR3_BASE
+#define FMW_MEM0_SIZE MCP_BACKUP_DDR3_SIZE
+#define FMW_MEM0_BASE MCP_BACKUP_DDR3_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
+#define FMW_MEM1_SIZE MCP_RAM1_SIZE
+#define FMW_MEM1_BASE MCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/n1sdp/scp_ramfw/fmw_memory.h b/product/n1sdp/scp_ramfw/fmw_memory.h
index 54f5f589..b804202f 100644
--- a/product/n1sdp/scp_ramfw/fmw_memory.h
+++ b/product/n1sdp/scp_ramfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "n1sdp_scp_system_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE SCP_RAM0_BASE
+#define FMW_MEM0_SIZE SCP_RAM0_SIZE
+#define FMW_MEM0_BASE SCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
+#define FMW_MEM1_SIZE SCP_RAM1_SIZE
+#define FMW_MEM1_BASE SCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/n1sdp/scp_romfw/fmw_memory.h b/product/n1sdp/scp_romfw/fmw_memory.h
index 467fbc2d..774fb287 100644
--- a/product/n1sdp/scp_romfw/fmw_memory.h
+++ b/product/n1sdp/scp_romfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "n1sdp_scp_system_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_BACKUP_DDR3_SIZE
-#define FIRMWARE_MEM0_BASE SCP_BACKUP_DDR3_BASE
+#define FMW_MEM0_SIZE SCP_BACKUP_DDR3_SIZE
+#define FMW_MEM0_BASE SCP_BACKUP_DDR3_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
+#define FMW_MEM1_SIZE SCP_RAM1_SIZE
+#define FMW_MEM1_BASE SCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rddaniel/mcp_romfw/fmw_memory.h b/product/rddaniel/mcp_romfw/fmw_memory.h
index 28b15541..78b4033c 100644
--- a/product/rddaniel/mcp_romfw/fmw_memory.h
+++ b/product/rddaniel/mcp_romfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "mcp_software_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE MCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE MCP_ROM_BASE
+#define FMW_MEM0_SIZE MCP_ROM_SIZE
+#define FMW_MEM0_BASE MCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
+#define FMW_MEM1_SIZE MCP_RAM1_SIZE
+#define FMW_MEM1_BASE MCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rddaniel/scp_ramfw/fmw_memory.h b/product/rddaniel/scp_ramfw/fmw_memory.h
index 01ff8e4f..78e028ee 100644
--- a/product/rddaniel/scp_ramfw/fmw_memory.h
+++ b/product/rddaniel/scp_ramfw/fmw_memory.h
@@ -14,18 +14,18 @@
 #include "scp_mmap.h"
 #include "scp_software_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_ITC_RAM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ITC_RAM_BASE
+#define FMW_MEM0_SIZE SCP_ITC_RAM_SIZE
+#define FMW_MEM0_BASE SCP_ITC_RAM_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_DTC_RAM_SIZE
-#define FIRMWARE_MEM1_BASE SCP_DTC_RAM_BASE
+#define FMW_MEM1_SIZE SCP_DTC_RAM_SIZE
+#define FMW_MEM1_BASE SCP_DTC_RAM_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rddaniel/scp_romfw/fmw_memory.h b/product/rddaniel/scp_romfw/fmw_memory.h
index 78978aba..c71e54e9 100644
--- a/product/rddaniel/scp_romfw/fmw_memory.h
+++ b/product/rddaniel/scp_romfw/fmw_memory.h
@@ -14,18 +14,18 @@
 #include "scp_mmap.h"
 #include "scp_software_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_BOOT_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_BOOT_ROM_BASE
+#define FMW_MEM0_SIZE SCP_BOOT_ROM_SIZE
+#define FMW_MEM0_BASE SCP_BOOT_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_DTC_RAM_SIZE
-#define FIRMWARE_MEM1_BASE SCP_DTC_RAM_BASE
+#define FMW_MEM1_SIZE SCP_DTC_RAM_SIZE
+#define FMW_MEM1_BASE SCP_DTC_RAM_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rddanielxlr/mcp_romfw/fmw_memory.h b/product/rddanielxlr/mcp_romfw/fmw_memory.h
index 2a663d43..4732772f 100644
--- a/product/rddanielxlr/mcp_romfw/fmw_memory.h
+++ b/product/rddanielxlr/mcp_romfw/fmw_memory.h
@@ -13,20 +13,20 @@
 
 #include <mcp_software_mmap.h>
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  MCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  MCP_ROM_BASE
+#define FMW_MEM0_SIZE MCP_ROM_SIZE
+#define FMW_MEM0_BASE MCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  MCP_RAM1_BASE
+#define FMW_MEM1_SIZE MCP_RAM1_SIZE
+#define FMW_MEM1_BASE MCP_RAM1_BASE
 
-#define FIRMWARE_STACK_SIZE (1 * 1024)
+#define FMW_STACK_SIZE (1 * 1024)
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rddanielxlr/scp_ramfw/fmw_memory.h b/product/rddanielxlr/scp_ramfw/fmw_memory.h
index 446e743e..8dca37e5 100644
--- a/product/rddanielxlr/scp_ramfw/fmw_memory.h
+++ b/product/rddanielxlr/scp_ramfw/fmw_memory.h
@@ -14,20 +14,20 @@
 #include "scp_mmap.h"
 #include "scp_software_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_ITC_RAM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_ITC_RAM_BASE
+#define FMW_MEM0_SIZE SCP_ITC_RAM_SIZE
+#define FMW_MEM0_BASE SCP_ITC_RAM_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_DTC_RAM_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_DTC_RAM_BASE
+#define FMW_MEM1_SIZE SCP_DTC_RAM_SIZE
+#define FMW_MEM1_BASE SCP_DTC_RAM_BASE
 
-#define FIRMWARE_STACK_SIZE (1 * 1024)
+#define FMW_STACK_SIZE (1 * 1024)
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rddanielxlr/scp_romfw/fmw_memory.h b/product/rddanielxlr/scp_romfw/fmw_memory.h
index 65fee647..995041f0 100644
--- a/product/rddanielxlr/scp_romfw/fmw_memory.h
+++ b/product/rddanielxlr/scp_romfw/fmw_memory.h
@@ -14,20 +14,20 @@
 #include "scp_mmap.h"
 #include "scp_software_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_BOOT_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_BOOT_ROM_BASE
+#define FMW_MEM0_SIZE SCP_BOOT_ROM_SIZE
+#define FMW_MEM0_BASE SCP_BOOT_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_DTC_RAM_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_DTC_RAM_BASE
+#define FMW_MEM1_SIZE SCP_DTC_RAM_SIZE
+#define FMW_MEM1_BASE SCP_DTC_RAM_BASE
 
-#define FIRMWARE_STACK_SIZE (1 * 1024)
+#define FMW_STACK_SIZE (1 * 1024)
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rdn1e1/mcp_romfw/fmw_memory.h b/product/rdn1e1/mcp_romfw/fmw_memory.h
index e5f2ad2c..f11ef653 100644
--- a/product/rdn1e1/mcp_romfw/fmw_memory.h
+++ b/product/rdn1e1/mcp_romfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "mcp_system_mmap_mcp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE MCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE MCP_ROM_BASE
+#define FMW_MEM0_SIZE MCP_ROM_SIZE
+#define FMW_MEM0_BASE MCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
+#define FMW_MEM1_SIZE MCP_RAM1_SIZE
+#define FMW_MEM1_BASE MCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rdn1e1/scp_ramfw/fmw_memory.h b/product/rdn1e1/scp_ramfw/fmw_memory.h
index a93bf537..5fc04a56 100644
--- a/product/rdn1e1/scp_ramfw/fmw_memory.h
+++ b/product/rdn1e1/scp_ramfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "scp_system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE SCP_RAM0_BASE
+#define FMW_MEM0_SIZE SCP_RAM0_SIZE
+#define FMW_MEM0_BASE SCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
+#define FMW_MEM1_SIZE SCP_RAM1_SIZE
+#define FMW_MEM1_BASE SCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/rdn1e1/scp_romfw/fmw_memory.h b/product/rdn1e1/scp_romfw/fmw_memory.h
index 5e04875d..96feeb5d 100644
--- a/product/rdn1e1/scp_romfw/fmw_memory.h
+++ b/product/rdn1e1/scp_romfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "scp_system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
+#define FMW_MEM0_SIZE SCP_ROM_SIZE
+#define FMW_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
+#define FMW_MEM1_SIZE SCP_RAM1_SIZE
+#define FMW_MEM1_BASE SCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/sgi575/mcp_romfw/fmw_memory.h b/product/sgi575/mcp_romfw/fmw_memory.h
index 813cb43c..33ed5973 100644
--- a/product/sgi575/mcp_romfw/fmw_memory.h
+++ b/product/sgi575/mcp_romfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "mcp_system_mmap_mcp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE MCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE MCP_ROM_BASE
+#define FMW_MEM0_SIZE MCP_ROM_SIZE
+#define FMW_MEM0_BASE MCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
+#define FMW_MEM1_SIZE MCP_RAM1_SIZE
+#define FMW_MEM1_BASE MCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/sgi575/scp_ramfw/fmw_memory.h b/product/sgi575/scp_ramfw/fmw_memory.h
index d5732096..034d6e35 100644
--- a/product/sgi575/scp_ramfw/fmw_memory.h
+++ b/product/sgi575/scp_ramfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "scp_system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE SCP_RAM0_BASE
+#define FMW_MEM0_SIZE SCP_RAM0_SIZE
+#define FMW_MEM0_BASE SCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
+#define FMW_MEM1_SIZE SCP_RAM1_SIZE
+#define FMW_MEM1_BASE SCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/sgi575/scp_romfw/fmw_memory.h b/product/sgi575/scp_romfw/fmw_memory.h
index 382f9cdb..495423b9 100644
--- a/product/sgi575/scp_romfw/fmw_memory.h
+++ b/product/sgi575/scp_romfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "scp_system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
+#define FMW_MEM0_SIZE SCP_ROM_SIZE
+#define FMW_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
+#define FMW_MEM1_SIZE SCP_RAM1_SIZE
+#define FMW_MEM1_BASE SCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/sgm775/scp_ramfw/fmw_memory.h b/product/sgm775/scp_ramfw/fmw_memory.h
index 61f70d45..56435d16 100644
--- a/product/sgm775/scp_ramfw/fmw_memory.h
+++ b/product/sgm775/scp_ramfw/fmw_memory.h
@@ -10,10 +10,10 @@
 
 #include "system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_SINGLE_REGION
+#define FMW_MEM_MODE FWK_MEM_MODE_SINGLE_REGION
 
 /* RAM */
-#define FIRMWARE_MEM0_BASE SCP_RAM_BASE
-#define FIRMWARE_MEM0_SIZE SCP_RAM_SIZE
+#define FMW_MEM0_BASE SCP_RAM_BASE
+#define FMW_MEM0_SIZE SCP_RAM_SIZE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/sgm775/scp_romfw/fmw_memory.h b/product/sgm775/scp_romfw/fmw_memory.h
index 2c1acfb5..299aa41a 100644
--- a/product/sgm775/scp_romfw/fmw_memory.h
+++ b/product/sgm775/scp_romfw/fmw_memory.h
@@ -13,13 +13,13 @@
 
 #include "system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
+#define FMW_MEM0_SIZE SCP_ROM_SIZE
+#define FMW_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory (16 KiB block at the top of the RAM)
@@ -28,7 +28,7 @@
  * and data) are placed at the end of the RAM memory to avoid being overwritten
  * by the bootloader when loading the RAM firmware image.
  */
-#define FIRMWARE_MEM1_SIZE (16 * 1024)
-#define FIRMWARE_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FIRMWARE_MEM1_SIZE)
+#define FMW_MEM1_SIZE (16 * 1024)
+#define FMW_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FMW_MEM1_SIZE)
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/sgm776/scp_ramfw/fmw_memory.h b/product/sgm776/scp_ramfw/fmw_memory.h
index 61f70d45..56435d16 100644
--- a/product/sgm776/scp_ramfw/fmw_memory.h
+++ b/product/sgm776/scp_ramfw/fmw_memory.h
@@ -10,10 +10,10 @@
 
 #include "system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_SINGLE_REGION
+#define FMW_MEM_MODE FWK_MEM_MODE_SINGLE_REGION
 
 /* RAM */
-#define FIRMWARE_MEM0_BASE SCP_RAM_BASE
-#define FIRMWARE_MEM0_SIZE SCP_RAM_SIZE
+#define FMW_MEM0_BASE SCP_RAM_BASE
+#define FMW_MEM0_SIZE SCP_RAM_SIZE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/sgm776/scp_romfw/fmw_memory.h b/product/sgm776/scp_romfw/fmw_memory.h
index 2c1acfb5..299aa41a 100644
--- a/product/sgm776/scp_romfw/fmw_memory.h
+++ b/product/sgm776/scp_romfw/fmw_memory.h
@@ -13,13 +13,13 @@
 
 #include "system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
+#define FMW_MEM0_SIZE SCP_ROM_SIZE
+#define FMW_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory (16 KiB block at the top of the RAM)
@@ -28,7 +28,7 @@
  * and data) are placed at the end of the RAM memory to avoid being overwritten
  * by the bootloader when loading the RAM firmware image.
  */
-#define FIRMWARE_MEM1_SIZE (16 * 1024)
-#define FIRMWARE_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FIRMWARE_MEM1_SIZE)
+#define FMW_MEM1_SIZE (16 * 1024)
+#define FMW_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FMW_MEM1_SIZE)
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/synquacer/scp_ramfw/fmw_memory.h b/product/synquacer/scp_ramfw/fmw_memory.h
index 2b9aa12d..4905ec65 100644
--- a/product/synquacer/scp_ramfw/fmw_memory.h
+++ b/product/synquacer/scp_ramfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "scp_system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE SCP_RAM0_BASE
+#define FMW_MEM0_SIZE SCP_RAM0_SIZE
+#define FMW_MEM0_BASE SCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_RAM2_SIZE
-#define FIRMWARE_MEM1_BASE SCP_RAM2_BASE
+#define FMW_MEM1_SIZE SCP_RAM2_SIZE
+#define FMW_MEM1_BASE SCP_RAM2_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/synquacer/scp_romfw/fmw_memory.h b/product/synquacer/scp_romfw/fmw_memory.h
index 382f9cdb..495423b9 100644
--- a/product/synquacer/scp_romfw/fmw_memory.h
+++ b/product/synquacer/scp_romfw/fmw_memory.h
@@ -13,18 +13,18 @@
 
 #include "scp_system_mmap_scp.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
+#define FMW_MEM0_SIZE SCP_ROM_SIZE
+#define FMW_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
+#define FMW_MEM1_SIZE SCP_RAM1_SIZE
+#define FMW_MEM1_BASE SCP_RAM1_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/tc0/scp_ramfw/fmw_memory.h b/product/tc0/scp_ramfw/fmw_memory.h
index 01ff8e4f..78e028ee 100644
--- a/product/tc0/scp_ramfw/fmw_memory.h
+++ b/product/tc0/scp_ramfw/fmw_memory.h
@@ -14,18 +14,18 @@
 #include "scp_mmap.h"
 #include "scp_software_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_ITC_RAM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_ITC_RAM_BASE
+#define FMW_MEM0_SIZE SCP_ITC_RAM_SIZE
+#define FMW_MEM0_BASE SCP_ITC_RAM_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_DTC_RAM_SIZE
-#define FIRMWARE_MEM1_BASE SCP_DTC_RAM_BASE
+#define FMW_MEM1_SIZE SCP_DTC_RAM_SIZE
+#define FMW_MEM1_BASE SCP_DTC_RAM_BASE
 
 #endif /* FMW_MEMORY_H */
diff --git a/product/tc0/scp_romfw/fmw_memory.h b/product/tc0/scp_romfw/fmw_memory.h
index 78978aba..c71e54e9 100644
--- a/product/tc0/scp_romfw/fmw_memory.h
+++ b/product/tc0/scp_romfw/fmw_memory.h
@@ -14,18 +14,18 @@
 #include "scp_mmap.h"
 #include "scp_software_mmap.h"
 
-#define FIRMWARE_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
+#define FMW_MEM_MODE FWK_MEM_MODE_DUAL_REGION_RELOCATION
 
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE SCP_BOOT_ROM_SIZE
-#define FIRMWARE_MEM0_BASE SCP_BOOT_ROM_BASE
+#define FMW_MEM0_SIZE SCP_BOOT_ROM_SIZE
+#define FMW_MEM0_BASE SCP_BOOT_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE SCP_DTC_RAM_SIZE
-#define FIRMWARE_MEM1_BASE SCP_DTC_RAM_BASE
+#define FMW_MEM1_SIZE SCP_DTC_RAM_SIZE
+#define FMW_MEM1_BASE SCP_DTC_RAM_BASE
 
 #endif /* FMW_MEMORY_H */