diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 16:03:05 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:49:26 +0000 |
| commit | 4e0fe2938e7d5bcd7e88af84279db5d871b36b4b (patch) | |
| tree | 46f6398e117caf7b0328e278043b97ec49c81817 /core | |
| parent | 4a18e729662d00de37e6c2d08f08af68e3224236 (diff) | |
| download | chrome-ec-4e0fe2938e7d5bcd7e88af84279db5d871b36b4b.tar.gz | |
Revert "core/cortex-m: Support chip with no flash."
This reverts commit 59364c835d14689c55e66551cd48c668814541df.
BUG=b:200823466
TEST=make buildall -j
merge conflict in core/cortex-m/ec.lds.S
Change-Id: Id1dbb33326ed3cda673c3225d686d340f8f98114
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273403
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/cortex-m/ec.lds.S | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index ad3a637714..46e1a970cc 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -29,9 +29,6 @@ ENTRY(reset) MEMORY { -#if !defined(CONFIG_FLASH_PHYSICAL) - IRAM (rwx) : ORIGIN = CONFIG_RAM_BASE, LENGTH = CONFIG_RAM_SIZE -#else #if defined(SECTION_IS_RO) && defined(NPCX_RO_HEADER) /* * Header structure used by npcx booter in RO region. @@ -49,9 +46,8 @@ MEMORY SHARED_LIB (rx) : ORIGIN = FW_OFF(SHAREDLIB), \ LENGTH = FW_SIZE(SHAREDLIB) #endif - IRAM (rw) : ORIGIN = CONFIG_RAM_BASE, LENGTH = CONFIG_RAM_SIZE -#endif /* !CONFIG_FLASH_PHYSICAL */ + IRAM (rw) : ORIGIN = CONFIG_RAM_BASE, LENGTH = CONFIG_RAM_SIZE #ifdef CONFIG_EXTERNAL_STORAGE CDRAM (rx) : \ ORIGIN = CONFIG_PROGRAM_MEMORY_BASE + FW_MEM_OFF(SECTION), \ @@ -147,11 +143,7 @@ SECTIONS __flash_lplfw_end = .; } > CDRAM AT > FLASH #else -#if !defined(CONFIG_FLASH_PHYSICAL) - } > IRAM -#else } > FLASH -#endif /* !CONFIG_FLASH_PHYSICAL */ #endif . = ALIGN(4); @@ -294,10 +286,7 @@ SECTIONS #endif . = ALIGN(4); -#if !defined(CONFIG_FLASH_PHYSICAL) - } > IRAM -#define DATA_LMA_MEM_REGION IROM -#elif defined(CONFIG_EXTERNAL_STORAGE) +#ifdef CONFIG_EXTERNAL_STORAGE } > CDRAM AT > FLASH #define DATA_LMA_MEM_REGION FLASH #else @@ -443,8 +432,6 @@ SECTIONS * will cause the linker to abort if we use too much. */ __hey_flash_used = LOADADDR(.data) + SIZEOF(.data) - FW_OFF(SECTION); - -#ifdef CONFIG_FLASH_PHYSICAL ASSERT((FW_SIZE(SECTION) #if defined(CONFIG_RWSIG) && defined(SECTION_IS_RO) - CONFIG_RO_PUBKEY_SIZE @@ -454,7 +441,6 @@ SECTIONS #endif ) >= (LOADADDR(.data) + SIZEOF(.data) - FW_OFF(SECTION)), "No room left in the flash") -#endif /* CONFIG_FLASH_PHYSICAL */ #if defined(SECTION_IS_RO) && defined(NPCX_RO_HEADER) __image_size = __hey_flash_used - FW_SIZE(RO_HDR); |