diff options
| author | Jeremy Bettis <jbettis@google.com> | 2021-04-27 13:40:37 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-27 22:12:03 +0000 |
| commit | fc1832097b9bbe40eb128828876803993a331ecb (patch) | |
| tree | 267f6dea59195a54ad45518dcd09fd6d7d2c5e33 /core | |
| parent | 99feee9047810e75c7beffa962d88956735f8654 (diff) | |
| download | chrome-ec-fc1832097b9bbe40eb128828876803993a331ecb.tar.gz | |
config: rename CONFIG_FLASH to CONFIG_FLASH_CROS
This reverts commit 4ac1d81e1430dbfbfba1376a23ab19dfa845d7ef.
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=chromium:1202406,b:180980668
TEST=make -j16 runhosttests buildall && zmake testall && \
/mnt/host/source/src/platform/ec/zephyr/firmware_builder.py --metrics \
/tmp/tmplt8ty8ci test ; echo $?
BRANCH=none
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I5b5e58b30d936b5232e049827f458d9a2ed06340
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2855320
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/cortex-m/ec.lds.S | 6 | ||||
| -rw-r--r-- | core/cortex-m0/ec.lds.S | 6 | ||||
| -rw-r--r-- | core/nds32/ec.lds.S | 6 | ||||
| -rw-r--r-- | core/riscv-rv32i/ec.lds.S | 6 |
4 files changed, 12 insertions, 12 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.*) } diff --git a/core/cortex-m0/ec.lds.S b/core/cortex-m0/ec.lds.S index f6023aa322..bc461b90de 100644 --- a/core/cortex-m0/ec.lds.S +++ b/core/cortex-m0/ec.lds.S @@ -220,7 +220,7 @@ SECTIONS *(.init.rom) __init_rom_end = .; -#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH) +#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH_CROS) . = ALIGN(64); KEEP(*(.google)) #endif @@ -315,7 +315,7 @@ SECTIONS __flash_used = LOADADDR(.data) + SIZEOF(.data) - ORIGIN(FLASH); __image_size = __flash_used; -#ifdef CONFIG_FLASH +#ifdef CONFIG_FLASH_CROS /* * These linker labels are just for analysis and not used in the code. */ @@ -353,7 +353,7 @@ SECTIONS #undef REGION #endif /* CONFIG_CHIP_MEMORY_REGIONS */ -#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH)) +#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH_CROS)) /DISCARD/ : { *(.google) } #endif /DISCARD/ : { *(.ARM.*) } diff --git a/core/nds32/ec.lds.S b/core/nds32/ec.lds.S index c10e3e82f7..2c21b94761 100644 --- a/core/nds32/ec.lds.S +++ b/core/nds32/ec.lds.S @@ -205,7 +205,7 @@ SECTIONS *(.init.rom) __init_rom_end = .; -#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH) +#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH_CROS) . = ALIGN(64); KEEP(*(.google)) #endif @@ -285,7 +285,7 @@ SECTIONS __flash_used = LOADADDR(.data) + SIZEOF(.data) - FW_OFF(SECTION); __image_size = __flash_used; -#ifdef CONFIG_FLASH +#ifdef CONFIG_FLASH_CROS /* * These linker labels are just for analysis and not used in the code. */ @@ -313,7 +313,7 @@ SECTIONS "Not enough space for h2ram section.") #endif -#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH)) +#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH_CROS)) /DISCARD/ : { *(.google) } #endif diff --git a/core/riscv-rv32i/ec.lds.S b/core/riscv-rv32i/ec.lds.S index 80d1208a69..e8963c1b14 100644 --- a/core/riscv-rv32i/ec.lds.S +++ b/core/riscv-rv32i/ec.lds.S @@ -254,7 +254,7 @@ SECTIONS . = ALIGN(4); *(.srodata*) -#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH) +#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH_CROS) . = ALIGN(64); KEEP(*(.google)) #endif @@ -360,7 +360,7 @@ SECTIONS #endif __image_size = __flash_used; -#ifdef CONFIG_FLASH +#ifdef CONFIG_FLASH_CROS /* * These linker labels are just for analysis and not used in the code. */ @@ -450,7 +450,7 @@ SECTIONS } > DRAM #endif /* CONFIG_DRAM_BASE */ -#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH)) +#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH_CROS)) /DISCARD/ : { *(.google) } #endif |