diff options
Diffstat (limited to 'zephyr')
| -rw-r--r-- | zephyr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | zephyr/Kconfig | 2 | ||||
| -rw-r--r-- | zephyr/Kconfig.flash | 4 | ||||
| -rw-r--r-- | zephyr/projects/asurada/hayato/prj.conf | 2 | ||||
| -rw-r--r-- | zephyr/projects/it8xxx2_evb/prj.conf | 2 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 6 | ||||
| -rw-r--r-- | zephyr/shim/src/CMakeLists.txt | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 13dae4ce82..acec9dfb46 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -268,7 +268,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_EXTPOWER_GPIO "${PLATFORM_EC}/common/extpower_gpio.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "${PLATFORM_EC}/common/fan.c") -zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FLASH +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FLASH_CROS "${PLATFORM_EC}/common/flash.c" "${PLATFORM_EC}/common/spi_flash_reg.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_HOSTCMD diff --git a/zephyr/Kconfig b/zephyr/Kconfig index 191f49ace4..358ac691f1 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -265,7 +265,7 @@ config PLATFORM_EC_EXTPOWER_GPIO project should define a GPIO pin named GPIO_AC_PRESENT, with extpower_interrupt configured as the handler in gpio_map.h. -config PLATFORM_EC_FLASH +config PLATFORM_EC_FLASH_CROS bool "Enable flash support" default y if FLASH_SIZE > 0 help diff --git a/zephyr/Kconfig.flash b/zephyr/Kconfig.flash index 74ec9521ed..e79732d928 100644 --- a/zephyr/Kconfig.flash +++ b/zephyr/Kconfig.flash @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -if PLATFORM_EC_FLASH +if PLATFORM_EC_FLASH_CROS config PLATFORM_EC_SPI_FLASH_REGS bool "Enable SPI flash registers" @@ -110,4 +110,4 @@ config PLATFORM_EC_MAPPED_STORAGE If this is not defined, the flash driver must implement flash_physical_read(). -endif # PLATFORM_EC_FLASH +endif # PLATFORM_EC_FLASH_CROS diff --git a/zephyr/projects/asurada/hayato/prj.conf b/zephyr/projects/asurada/hayato/prj.conf index cb06837f50..fe04424690 100644 --- a/zephyr/projects/asurada/hayato/prj.conf +++ b/zephyr/projects/asurada/hayato/prj.conf @@ -8,7 +8,7 @@ CONFIG_PLATFORM_EC_BRINGUP=y CONFIG_SHIMMED_TASKS=y # Flash -CONFIG_PLATFORM_EC_FLASH=y +CONFIG_PLATFORM_EC_FLASH_CROS=y # TODO(b/180980668): bring these features up CONFIG_LTO=n diff --git a/zephyr/projects/it8xxx2_evb/prj.conf b/zephyr/projects/it8xxx2_evb/prj.conf index df177e8f11..3364bde087 100644 --- a/zephyr/projects/it8xxx2_evb/prj.conf +++ b/zephyr/projects/it8xxx2_evb/prj.conf @@ -13,7 +13,7 @@ CONFIG_PLATFORM_EC_VBOOT=n CONFIG_PLATFORM_EC_ADC=n # Flash -CONFIG_PLATFORM_EC_FLASH=y +CONFIG_PLATFORM_EC_FLASH_CROS=y # I2C master CONFIG_PLATFORM_EC_I2C=n diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index c83d9f89eb..7e79ddf4b1 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -288,8 +288,8 @@ #undef CONFIG_MAPPED_STORAGE #undef CONFIG_FLASH_PSTATE #undef CONFIG_FLASH_SIZE_BYTES -#ifdef CONFIG_PLATFORM_EC_FLASH -#define CONFIG_FLASH +#ifdef CONFIG_PLATFORM_EC_FLASH_CROS +#define CONFIG_FLASH_CROS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ #ifdef CONFIG_FLASH_SIZE #define CONFIG_FLASH_SIZE_BYTES (CONFIG_FLASH_SIZE * 1024) @@ -337,7 +337,7 @@ #define CONFIG_CMD_FLASH_WP #endif -#endif /* CONFIG_PLATFORM_EC_FLASH */ +#endif /* CONFIG_PLATFORM_EC_FLASH_CROS */ #undef CONFIG_ADC #ifdef CONFIG_PLATFORM_EC_ADC diff --git a/zephyr/shim/src/CMakeLists.txt b/zephyr/shim/src/CMakeLists.txt index ce4ed14323..439ea374de 100644 --- a/zephyr/shim/src/CMakeLists.txt +++ b/zephyr/shim/src/CMakeLists.txt @@ -18,7 +18,7 @@ zephyr_library_sources_ifdef(no_libgcc libgcc_${ARCH}.S) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ADC adc.c) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ESPI espi.c) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN fan.c) -zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FLASH flash.c) +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FLASH_CROS flash.c) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_HOOKS hooks.c) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_HOSTCMD host_command.c) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_HOSTCMD_CONSOLE |