diff options
author | Eric Yilun Lin <yllin@chromium.org> | 2021-04-09 15:55:35 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-04-23 21:41:36 +0000 |
commit | 4e074a16c5703f0cdd7b7d780a8ae1bea53a445a (patch) | |
tree | ee55f33d67210001d31d852ba380a27778cbe379 /core/cortex-m/ec.lds.S | |
parent | d1156aae265e671c6779026ce52716f42847f9f9 (diff) | |
download | chrome-ec-4e074a16c5703f0cdd7b7d780a8ae1bea53a445a.tar.gz |
config: rename CONFIG_FLASH to CONFIG_FLASH_CROS
The config name collides with the same config name in zephyr.
Also, renames zephyr Kconfig CONFIG_PLATFORM_EC_FLASH to
CONFIG_PLATFORM_EC_FLASH_CROS as the corresponding change at Kconfig
side.
BUG=b:180980668
TEST=make buildall
BRANCH=none
Change-Id: Ibac008ddff8c041aae04dca0bbf973823abe7640
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2816622
Tested-by: Eric Yilun Lin <yllin@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'core/cortex-m/ec.lds.S')
-rw-r--r-- | core/cortex-m/ec.lds.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/cortex-m/ec.lds.S b/core/cortex-m/ec.lds.S index 85bc9ea5cb..c2c3ea12a3 100644 --- a/core/cortex-m/ec.lds.S +++ b/core/cortex-m/ec.lds.S @@ -345,7 +345,7 @@ SECTIONS __init_rom_end = .; #endif /* CONFIG_CHIP_INIT_ROM_REGION */ -#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH) +#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH_CROS) . = ALIGN(64); KEEP(*(.google)) #endif @@ -503,7 +503,7 @@ SECTIONS __image_size = __flash_used; #endif /* CONFIG_CHIP_INIT_ROM_REGION */ -#ifdef CONFIG_FLASH +#ifdef CONFIG_FLASH_CROS /* * These linker labels are just for analysis and not used in the code. */ @@ -703,7 +703,7 @@ SECTIONS } > DRAM #endif -#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH)) +#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH_CROS)) /DISCARD/ : { *(.google) } #endif /DISCARD/ : { *(.ARM.*) } |