diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-04-24 15:29:41 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-24 19:34:04 +0000 |
| commit | 4ac1d81e1430dbfbfba1376a23ab19dfa845d7ef (patch) | |
| tree | 1c4ed92d40e0c4e93c1253d79e11f574d7ee1e7d /core | |
| parent | f0be771092e47854664c6028c56d1499ca412f8a (diff) | |
| download | chrome-ec-4ac1d81e1430dbfbfba1376a23ab19dfa845d7ef.tar.gz | |
Revert "config: rename CONFIG_FLASH to CONFIG_FLASH_CROS"stabilize-13935.B-main
This reverts commit 4e074a16c5703f0cdd7b7d780a8ae1bea53a445a.
Reason for revert: responsible for CQ failures (crbug.com/1202406)
BUG=chromium:1202406
BRANCH=none
TEST=CQ
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Original change's description:
> 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>
Bug: b:180980668
Change-Id: Idc5e799d3b0ea8cc76dbbb49a91b3758ce6e9719
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2847274
Auto-Submit: Jack Rosenthal <jrosenth@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jack Rosenthal <jrosenth@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 c2c3ea12a3..85bc9ea5cb 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_CROS) +#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH) . = ALIGN(64); KEEP(*(.google)) #endif @@ -503,7 +503,7 @@ SECTIONS __image_size = __flash_used; #endif /* CONFIG_CHIP_INIT_ROM_REGION */ -#ifdef CONFIG_FLASH_CROS +#ifdef CONFIG_FLASH /* * 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_CROS)) +#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH)) /DISCARD/ : { *(.google) } #endif /DISCARD/ : { *(.ARM.*) } diff --git a/core/cortex-m0/ec.lds.S b/core/cortex-m0/ec.lds.S index bc461b90de..f6023aa322 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_CROS) +#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH) . = 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_CROS +#ifdef CONFIG_FLASH /* * 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_CROS)) +#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH)) /DISCARD/ : { *(.google) } #endif /DISCARD/ : { *(.ARM.*) } diff --git a/core/nds32/ec.lds.S b/core/nds32/ec.lds.S index 2c21b94761..c10e3e82f7 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_CROS) +#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH) . = 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_CROS +#ifdef CONFIG_FLASH /* * 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_CROS)) +#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH)) /DISCARD/ : { *(.google) } #endif diff --git a/core/riscv-rv32i/ec.lds.S b/core/riscv-rv32i/ec.lds.S index e8963c1b14..80d1208a69 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_CROS) +#if defined(SECTION_IS_RO) && defined(CONFIG_FLASH) . = ALIGN(64); KEEP(*(.google)) #endif @@ -360,7 +360,7 @@ SECTIONS #endif __image_size = __flash_used; -#ifdef CONFIG_FLASH_CROS +#ifdef CONFIG_FLASH /* * 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_CROS)) +#if !(defined(SECTION_IS_RO) && defined(CONFIG_FLASH)) /DISCARD/ : { *(.google) } #endif |