fwk: Rename <fmw_memory.ld.S> to <fmw_memory.h>

This header file is used in non-linker script contexts, so it makes
sense to provide a name to match.

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

24 files changed, 141 insertions, 142 deletions

diff --git a/arch/src/armv7-m/scatter.h b/arch/src/armv7-m/scatter.h
index 40220583..8499808d 100644
--- a/arch/src/armv7-m/scatter.h
+++ b/arch/src/armv7-m/scatter.h
@@ -35,7 +35,7 @@
 #define FWK_MEM_MODE_DUAL_REGION_RELOCATION 1
 #define FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION 2
 
-#include <fmw_memory.ld.S>
+#include <fmw_memory.h>
 
 #ifndef FIRMWARE_MEM_MODE
     #error "FIRMWARE_MEM_MODE has not been configured"
diff --git a/doc/framework.md b/doc/framework.md
index 4672c7ed..92f3c2bf 100644
--- a/doc/framework.md
+++ b/doc/framework.md
@@ -66,8 +66,7 @@ represents a software image that is built as part of a product. Each firmware
 lists the modules that will be built into its image and provides configuration
 data for each of these modules.
 
-For each firmware, linker information must be provided in a *fmw_memory.ld.S*
-file:
+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:
@@ -97,7 +96,7 @@ firmware_root/
     config_module_a.c
     config_module_b.c
     firmware.mk
-    fmw_memory.ld.s
+    fmw_memory.h
 \endcode
 
 ### Modules
diff --git a/product/juno/scp_ramfw/fmw_memory.ld.S b/product/juno/scp_ramfw/fmw_memory.h
index 870aac21..ab4ddc3e 100644
--- a/product/juno/scp_ramfw/fmw_memory.ld.S
+++ b/product/juno/scp_ramfw/fmw_memory.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_mmap.h>
 
@@ -18,4 +18,4 @@
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/juno/scp_romfw/fmw_memory.ld.S b/product/juno/scp_romfw/fmw_memory.h
index adf646f3..268500ec 100644
--- a/product/juno/scp_romfw/fmw_memory.ld.S
+++ b/product/juno/scp_romfw/fmw_memory.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_mmap.h>
 
@@ -22,4 +22,4 @@
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/juno/scp_romfw_bypass/fmw_memory.ld.S b/product/juno/scp_romfw_bypass/fmw_memory.h
index adf646f3..268500ec 100644
--- a/product/juno/scp_romfw_bypass/fmw_memory.ld.S
+++ b/product/juno/scp_romfw_bypass/fmw_memory.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_mmap.h>
 
@@ -22,4 +22,4 @@
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/n1sdp/mcp_ramfw/fmw_memory.ld.S b/product/n1sdp/mcp_ramfw/fmw_memory.h
index 5336fc9e..44998260 100644
--- a/product/n1sdp/mcp_ramfw/fmw_memory.ld.S
+++ b/product/n1sdp/mcp_ramfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     RAM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <n1sdp_mcp_system_mmap.h>
 
@@ -18,15 +18,15 @@
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE  MCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE  MCP_RAM0_BASE
+#define FIRMWARE_MEM0_SIZE MCP_RAM0_SIZE
+#define FIRMWARE_MEM0_BASE MCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE  MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  MCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/n1sdp/mcp_romfw/fmw_memory.ld.S b/product/n1sdp/mcp_romfw/fmw_memory.h
index 3629ea26..b24d6693 100644
--- a/product/n1sdp/mcp_romfw/fmw_memory.ld.S
+++ b/product/n1sdp/mcp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <n1sdp_mcp_system_mmap.h>
 
@@ -18,15 +18,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  MCP_BACKUP_DDR3_SIZE
-#define FIRMWARE_MEM0_BASE  MCP_BACKUP_DDR3_BASE
+#define FIRMWARE_MEM0_SIZE MCP_BACKUP_DDR3_SIZE
+#define FIRMWARE_MEM0_BASE MCP_BACKUP_DDR3_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  MCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/n1sdp/scp_ramfw/fmw_memory.ld.S b/product/n1sdp/scp_ramfw/fmw_memory.h
index 355cde87..d3d52468 100644
--- a/product/n1sdp/scp_ramfw/fmw_memory.ld.S
+++ b/product/n1sdp/scp_ramfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     RAM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <n1sdp_scp_system_mmap.h>
 
@@ -18,15 +18,15 @@
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_RAM0_BASE
+#define FIRMWARE_MEM0_SIZE SCP_RAM0_SIZE
+#define FIRMWARE_MEM0_BASE SCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/n1sdp/scp_romfw/fmw_memory.ld.S b/product/n1sdp/scp_romfw/fmw_memory.h
index 4b71428e..f4e2ab73 100644
--- a/product/n1sdp/scp_romfw/fmw_memory.ld.S
+++ b/product/n1sdp/scp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <n1sdp_scp_system_mmap.h>
 
@@ -18,15 +18,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_BACKUP_DDR3_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_BACKUP_DDR3_BASE
+#define FIRMWARE_MEM0_SIZE SCP_BACKUP_DDR3_SIZE
+#define FIRMWARE_MEM0_BASE SCP_BACKUP_DDR3_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/rddaniel/mcp_romfw/fmw_memory.ld.S b/product/rddaniel/mcp_romfw/fmw_memory.h
index 5d32c41e..594d72c4 100644
--- a/product/rddaniel/mcp_romfw/fmw_memory.ld.S
+++ b/product/rddaniel/mcp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <mcp_software_mmap.h>
 
@@ -18,15 +18,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  MCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  MCP_ROM_BASE
+#define FIRMWARE_MEM0_SIZE MCP_ROM_SIZE
+#define FIRMWARE_MEM0_BASE MCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  MCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/rddaniel/scp_ramfw/fmw_memory.ld.S b/product/rddaniel/scp_ramfw/fmw_memory.h
index 5c4568c9..1382403f 100644
--- a/product/rddaniel/scp_ramfw/fmw_memory.ld.S
+++ b/product/rddaniel/scp_ramfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     RAM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_mmap.h>
 #include <scp_software_mmap.h>
@@ -19,15 +19,15 @@
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_ITC_RAM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_ITC_RAM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_ITC_RAM_SIZE
+#define FIRMWARE_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 FIRMWARE_MEM1_SIZE SCP_DTC_RAM_SIZE
+#define FIRMWARE_MEM1_BASE SCP_DTC_RAM_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/rddaniel/scp_romfw/fmw_memory.ld.S b/product/rddaniel/scp_romfw/fmw_memory.h
index 85137de2..37b0a87f 100644
--- a/product/rddaniel/scp_romfw/fmw_memory.ld.S
+++ b/product/rddaniel/scp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_mmap.h>
 #include <scp_software_mmap.h>
@@ -19,15 +19,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_BOOT_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_BOOT_ROM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_BOOT_ROM_SIZE
+#define FIRMWARE_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 FIRMWARE_MEM1_SIZE SCP_DTC_RAM_SIZE
+#define FIRMWARE_MEM1_BASE SCP_DTC_RAM_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/rdn1e1/mcp_romfw/fmw_memory.ld.S b/product/rdn1e1/mcp_romfw/fmw_memory.h
index 43935121..54f71402 100644
--- a/product/rdn1e1/mcp_romfw/fmw_memory.ld.S
+++ b/product/rdn1e1/mcp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <mcp_system_mmap_mcp.h>
 
@@ -18,15 +18,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  MCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  MCP_ROM_BASE
+#define FIRMWARE_MEM0_SIZE MCP_ROM_SIZE
+#define FIRMWARE_MEM0_BASE MCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  MCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/rdn1e1/scp_ramfw/fmw_memory.ld.S b/product/rdn1e1/scp_ramfw/fmw_memory.h
index 699eedf4..73d2e047 100644
--- a/product/rdn1e1/scp_ramfw/fmw_memory.ld.S
+++ b/product/rdn1e1/scp_ramfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     RAM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_system_mmap_scp.h>
 
@@ -18,15 +18,15 @@
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_RAM0_BASE
+#define FIRMWARE_MEM0_SIZE SCP_RAM0_SIZE
+#define FIRMWARE_MEM0_BASE SCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/rdn1e1/scp_romfw/fmw_memory.ld.S b/product/rdn1e1/scp_romfw/fmw_memory.h
index fd0a7f7e..246b8d9e 100644
--- a/product/rdn1e1/scp_romfw/fmw_memory.ld.S
+++ b/product/rdn1e1/scp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_system_mmap_scp.h>
 
@@ -18,15 +18,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_ROM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
+#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/sgi575/mcp_romfw/fmw_memory.ld.S b/product/sgi575/mcp_romfw/fmw_memory.h
index 2e649f6d..29ba6d0b 100644
--- a/product/sgi575/mcp_romfw/fmw_memory.ld.S
+++ b/product/sgi575/mcp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <mcp_system_mmap_mcp.h>
 
@@ -18,15 +18,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  MCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  MCP_ROM_BASE
+#define FIRMWARE_MEM0_SIZE MCP_ROM_SIZE
+#define FIRMWARE_MEM0_BASE MCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  MCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  MCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE MCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE MCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/sgi575/scp_ramfw/fmw_memory.ld.S b/product/sgi575/scp_ramfw/fmw_memory.h
index 53d824eb..80dc39f3 100644
--- a/product/sgi575/scp_ramfw/fmw_memory.ld.S
+++ b/product/sgi575/scp_ramfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     RAM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_system_mmap_scp.h>
 
@@ -18,15 +18,15 @@
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_RAM0_BASE
+#define FIRMWARE_MEM0_SIZE SCP_RAM0_SIZE
+#define FIRMWARE_MEM0_BASE SCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/synquacer/scp_romfw/fmw_memory.ld.S b/product/sgi575/scp_romfw/fmw_memory.h
index d6a00275..493aaa53 100644
--- a/product/synquacer/scp_romfw/fmw_memory.ld.S
+++ b/product/sgi575/scp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_system_mmap_scp.h>
 
@@ -18,15 +18,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_ROM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
+#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/sgm775/scp_ramfw/fmw_memory.ld.S b/product/sgm775/scp_ramfw/fmw_memory.h
index 93145103..03e02eb0 100644
--- a/product/sgm775/scp_ramfw/fmw_memory.ld.S
+++ b/product/sgm775/scp_ramfw/fmw_memory.h
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <system_mmap_scp.h>
 
 #define FIRMWARE_MEM_MODE FWK_MEM_MODE_SINGLE_REGION
 
 /* RAM */
-#define FIRMWARE_MEM0_BASE  SCP_RAM_BASE
-#define FIRMWARE_MEM0_SIZE  SCP_RAM_SIZE
+#define FIRMWARE_MEM0_BASE SCP_RAM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_RAM_SIZE
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/sgm775/scp_romfw/fmw_memory.ld.S b/product/sgm775/scp_romfw/fmw_memory.h
index 76d101c7..2ab23458 100644
--- a/product/sgm775/scp_romfw/fmw_memory.ld.S
+++ b/product/sgm775/scp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <system_mmap_scp.h>
 
@@ -18,8 +18,8 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_ROM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
+#define FIRMWARE_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 FIRMWARE_MEM1_SIZE (16 * 1024)
+#define FIRMWARE_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FIRMWARE_MEM1_SIZE)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/sgm776/scp_ramfw/fmw_memory.ld.S b/product/sgm776/scp_ramfw/fmw_memory.h
index 4f062809..dc79d313 100644
--- a/product/sgm776/scp_ramfw/fmw_memory.ld.S
+++ b/product/sgm776/scp_ramfw/fmw_memory.h
@@ -5,17 +5,17 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <system_mmap_scp.h>
 
 #define FIRMWARE_MEM_MODE FWK_MEM_MODE_SINGLE_REGION
 
 /* RAM */
-#define FIRMWARE_MEM0_BASE  SCP_RAM_BASE
-#define FIRMWARE_MEM0_SIZE  SCP_RAM_SIZE
+#define FIRMWARE_MEM0_BASE SCP_RAM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_RAM_SIZE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/sgm776/scp_romfw/fmw_memory.ld.S b/product/sgm776/scp_romfw/fmw_memory.h
index 07b5ffe8..de13adbe 100644
--- a/product/sgm776/scp_romfw/fmw_memory.ld.S
+++ b/product/sgm776/scp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <system_mmap_scp.h>
 
@@ -18,8 +18,8 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_ROM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
+#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory (16 KiB block at the top of the RAM)
@@ -28,9 +28,9 @@
  * 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 FIRMWARE_MEM1_SIZE (16 * 1024)
+#define FIRMWARE_MEM1_BASE (SCP_RAM_BASE + SCP_RAM_SIZE - FIRMWARE_MEM1_SIZE)
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/synquacer/scp_ramfw/fmw_memory.ld.S b/product/synquacer/scp_ramfw/fmw_memory.h
index 83624985..e8d59b8f 100644
--- a/product/synquacer/scp_ramfw/fmw_memory.ld.S
+++ b/product/synquacer/scp_ramfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     RAM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_system_mmap_scp.h>
 
@@ -18,15 +18,15 @@
 /*
  * RAM instruction memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_RAM0_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_RAM0_BASE
+#define FIRMWARE_MEM0_SIZE SCP_RAM0_SIZE
+#define FIRMWARE_MEM0_BASE SCP_RAM0_BASE
 
 /*
  * RAM data memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_RAM2_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_RAM2_BASE
+#define FIRMWARE_MEM1_SIZE SCP_RAM2_SIZE
+#define FIRMWARE_MEM1_BASE SCP_RAM2_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */
diff --git a/product/sgi575/scp_romfw/fmw_memory.ld.S b/product/synquacer/scp_romfw/fmw_memory.h
index d6a00275..493aaa53 100644
--- a/product/sgi575/scp_romfw/fmw_memory.ld.S
+++ b/product/synquacer/scp_romfw/fmw_memory.h
@@ -8,8 +8,8 @@
  *     ROM firmware memory layout for the linker script.
  */
 
-#ifndef FMW_MEMORY_LD_S
-#define FMW_MEMORY_LD_S
+#ifndef FMW_MEMORY_H
+#define FMW_MEMORY_H
 
 #include <scp_system_mmap_scp.h>
 
@@ -18,15 +18,15 @@
 /*
  * ROM memory
  */
-#define FIRMWARE_MEM0_SIZE  SCP_ROM_SIZE
-#define FIRMWARE_MEM0_BASE  SCP_ROM_BASE
+#define FIRMWARE_MEM0_SIZE SCP_ROM_SIZE
+#define FIRMWARE_MEM0_BASE SCP_ROM_BASE
 
 /*
  * RAM memory
  */
-#define FIRMWARE_MEM1_SIZE  SCP_RAM1_SIZE
-#define FIRMWARE_MEM1_BASE  SCP_RAM1_BASE
+#define FIRMWARE_MEM1_SIZE SCP_RAM1_SIZE
+#define FIRMWARE_MEM1_BASE SCP_RAM1_BASE
 
 #define FIRMWARE_STACK_SIZE (1 * 1024)
 
-#endif /* FMW_MEMORY_LD_S */
+#endif /* FMW_MEMORY_H */