summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Hesling <hesling@chromium.org>2019-12-16 17:16:58 -0800
committerCommit Bot <commit-bot@chromium.org>2019-12-17 22:29:07 +0000
commitb8d97655fc0c5b19042fc1c28384c0580debb9c0 (patch)
treecaa358442384a2de73d3f74c30898d97402e968d
parent340804c765a2e6e6cb9e3f296f2f68c47ad8521e (diff)
downloadchrome-ec-b8d97655fc0c5b19042fc1c28384c0580debb9c0.tar.gz
common: Format firmware_image linker script
This is a cleanup/reformat of the linker script. This brings no functional change. BRANCH=none BUG=b:146083406 TEST=make buildall Change-Id: Ia86d7ed16ad3d12c26688b23e79ffb6f4bba9531 Signed-off-by: Craig Hesling <hesling@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1970812 Reviewed-by: Jett Rink <jettrink@chromium.org> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r--common/firmware_image.lds.S89
1 files changed, 47 insertions, 42 deletions
diff --git a/common/firmware_image.lds.S b/common/firmware_image.lds.S
index 350aeb3bc7..7522cf792a 100644
--- a/common/firmware_image.lds.S
+++ b/common/firmware_image.lds.S
@@ -7,17 +7,19 @@
#include "rwsig.h"
#ifdef NPCX_RO_HEADER
-/* Replace *_MEM_OFF with *_STORAGE_OFF to indicate flat file contains header
- * or some struture which doesn't belong to FW */
+/*
+ * Replace *_MEM_OFF with *_STORAGE_OFF to indicate flat file contains header
+ * or some struture which doesn't belong to FW
+ */
#define IMAGE_RO_AT (CONFIG_PROGRAM_MEMORY_BASE + \
- CONFIG_EC_PROTECTED_STORAGE_OFF)
+ CONFIG_EC_PROTECTED_STORAGE_OFF)
/* npcx uses *STORAGE_OFF to plan the layout of flash image */
#define IMAGE_RW_AT (CONFIG_PROGRAM_MEMORY_BASE + \
- CONFIG_EC_WRITABLE_STORAGE_OFF + \
- CONFIG_RW_STORAGE_OFF)
+ CONFIG_EC_WRITABLE_STORAGE_OFF + \
+ CONFIG_RW_STORAGE_OFF)
#define IMAGE_RW_B_AT (CONFIG_PROGRAM_MEMORY_BASE + \
- CONFIG_EC_WRITABLE_STORAGE_OFF + \
- CONFIG_RW_B_STORAGE_OFF)
+ CONFIG_EC_WRITABLE_STORAGE_OFF + \
+ CONFIG_RW_B_STORAGE_OFF)
#elif (CONFIG_RO_MEM_OFF == CONFIG_RW_MEM_OFF)
#define IMAGE_RO_AT (CONFIG_PROGRAM_MEMORY_BASE + CONFIG_RO_MEM_OFF)
@@ -25,9 +27,9 @@
mapped to the same location but we still have to generate an ec.bin with RO
and RW images at different Flash offset */
#define IMAGE_RW_AT (CONFIG_PROGRAM_MEMORY_BASE + \
- CONFIG_RO_MEM_OFF + CONFIG_RO_SIZE)
+ CONFIG_RO_MEM_OFF + CONFIG_RO_SIZE)
#define IMAGE_RW_B_AT (CONFIG_PROGRAM_MEMORY_BASE + \
- CONFIG_RO_MEM_OFF + CONFIG_RO_SIZE + CONFIG_RW_SIZE)
+ CONFIG_RO_MEM_OFF + CONFIG_RO_SIZE + CONFIG_RW_SIZE)
#else
#define IMAGE_RO_AT (CONFIG_PROGRAM_MEMORY_BASE + CONFIG_RO_MEM_OFF)
@@ -37,63 +39,66 @@ and RW images at different Flash offset */
OUTPUT_FORMAT(BFD_FORMAT, BFD_FORMAT, BFD_FORMAT)
OUTPUT_ARCH(BFD_ARCH)
+
MEMORY
{
- FLASH (rx) : ORIGIN = CONFIG_PROGRAM_MEMORY_BASE, LENGTH = CONFIG_FLASH_SIZE
+ FLASH (rx) : ORIGIN = CONFIG_PROGRAM_MEMORY_BASE,
+ LENGTH = CONFIG_FLASH_SIZE
#ifdef CONFIG_DRAM_BASE
- DRAM (rx) : ORIGIN = CONFIG_DRAM_BASE_LOAD, LENGTH = CONFIG_DRAM_SIZE
+ DRAM (rx) : ORIGIN = CONFIG_DRAM_BASE_LOAD, LENGTH = CONFIG_DRAM_SIZE
#endif
}
+
SECTIONS
{
- .image.RO : AT(IMAGE_RO_AT) {
- *(.image.RO)
- } > FLASH =0xff
+ .image.RO : AT(IMAGE_RO_AT) {
+ *(.image.RO)
+ } > FLASH =0xff
#ifdef CONFIG_RWSIG_TYPE_RWSIG
- .image.RO.key : AT(CONFIG_RO_PUBKEY_ADDR) {
- *(.image.RO.key)
- } > FLASH =0xff
+ .image.RO.key : AT(CONFIG_RO_PUBKEY_ADDR) {
+ *(.image.RO.key)
+ } > FLASH =0xff
#endif
#ifdef CONFIG_ROLLBACK
- .image.ROLLBACK : AT(CONFIG_PROGRAM_MEMORY_BASE + CONFIG_ROLLBACK_OFF) {
- *(.image.ROLLBACK)
- } > FLASH =0xff
+ .image.ROLLBACK : AT(CONFIG_PROGRAM_MEMORY_BASE + CONFIG_ROLLBACK_OFF) {
+ *(.image.ROLLBACK)
+ } > FLASH =0xff
#endif
#ifdef CONFIG_SHAREDLIB
- .image.libsharedobjs : AT(CONFIG_PROGRAM_MEMORY_BASE + \
- CONFIG_SHAREDLIB_MEM_OFF) {
- *(.image.libsharedobjs)
- } > FLASH =0xff
+ .image.libsharedobjs : AT(CONFIG_PROGRAM_MEMORY_BASE + \
+ CONFIG_SHAREDLIB_MEM_OFF) {
+ *(.image.libsharedobjs)
+ } > FLASH =0xff
#endif
- .image.RW : AT(IMAGE_RW_AT) {
- *(.image.RW)
- } > FLASH =0xff
+ .image.RW : AT(IMAGE_RW_AT) {
+ *(.image.RW)
+ } > FLASH =0xff
#ifdef CONFIG_RWSIG_TYPE_RWSIG
- .image.RW.sign : AT(CONFIG_RW_SIG_ADDR) {
- *(.image.RW.sign)
- } > FLASH =0xff
+ .image.RW.sign : AT(CONFIG_RW_SIG_ADDR) {
+ *(.image.RW.sign)
+ } > FLASH =0xff
#endif
#ifdef CONFIG_RW_B_MEM_OFF
- .image.RW_B : AT(IMAGE_RW_B_AT) {
- *(.image.RW_B)
- } > FLASH =0xff
+ .image.RW_B : AT(IMAGE_RW_B_AT) {
+ *(.image.RW_B)
+ } > FLASH =0xff
#ifdef CONFIG_RWSIG_TYPE_RWSIG
- .image.RW_B.sign : AT(CONFIG_RW_B_SIG_ADDR) {
- *(.image.RW_B.sign)
- } > FLASH =0xff
+ .image.RW_B.sign : AT(CONFIG_RW_B_SIG_ADDR) {
+ *(.image.RW_B.sign)
+ } > FLASH =0xff
#endif
#endif
- .padding : AT(CONFIG_PROGRAM_MEMORY_BASE + CONFIG_FLASH_SIZE - 1) {
- BYTE(0xff);
- } > FLASH =0xff
+ .padding : AT(CONFIG_PROGRAM_MEMORY_BASE + CONFIG_FLASH_SIZE - 1) {
+ BYTE(0xff);
+ } > FLASH =0xff
#ifdef CONFIG_DRAM_BASE
- .image.RW.dram : AT(CONFIG_DRAM_BASE_LOAD) {
- *(.image.RW.dram)
- } > DRAM =0x00
+ .image.RW.dram : AT(CONFIG_DRAM_BASE_LOAD) {
+ *(.image.RW.dram)
+ } > DRAM =0x00
#endif
}