diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-01-05 16:46:32 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-07 19:21:43 +0000 |
| commit | 96dd761f8a9a2858eb205efaf3bfa1352333f347 (patch) | |
| tree | f5f89638845acaf4370497df8e1b1097605c6dc3 | |
| parent | ade6b1e007428e85dc9b69e9a9c259bc6622f0d4 (diff) | |
| download | chrome-ec-96dd761f8a9a2858eb205efaf3bfa1352333f347.tar.gz | |
coil: CONFIG_I2C_SLAVE->CONFIG_I2C_PERIPH
BUG=b:175244613
TEST=make buildall -j
Change-Id: Icd2d47a031c5132cb9bca618c5c5ed8cd9e80c07
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2611756
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
| -rw-r--r-- | board/cr50/board.h | 2 | ||||
| -rw-r--r-- | chip/g/build.mk | 2 | ||||
| -rw-r--r-- | common/build.mk | 2 | ||||
| -rw-r--r-- | core/riscv-rv32i/ec.lds.S | 6 | ||||
| -rw-r--r-- | include/config.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/board/cr50/board.h b/board/cr50/board.h index 4b616920a2..b11d4c42ad 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -508,7 +508,7 @@ enum nvmem_users { #define CONFIG_I2C #define CONFIG_I2C_MASTER -#define CONFIG_I2C_SLAVE +#define CONFIG_I2C_PERIPH #define CONFIG_TPM_I2CS #define CONFIG_BOARD_ID_SUPPORT diff --git a/chip/g/build.mk b/chip/g/build.mk index f1ec4cc03f..9564837834 100644 --- a/chip/g/build.mk +++ b/chip/g/build.mk @@ -83,7 +83,7 @@ chip-$(CONFIG_RBOX)+=rbox.o chip-$(CONFIG_STREAM_USB)+=usb-stream.o chip-$(CONFIG_STREAM_USART)+=usart.o chip-$(CONFIG_I2C_MASTER)+= i2cm.o -chip-$(CONFIG_I2C_SLAVE)+= i2cs.o +chip-$(CONFIG_I2C_PERIPH)+= i2cs.o chip-$(CONFIG_LOW_POWER_IDLE)+=idle.o diff --git a/common/build.mk b/common/build.mk index 1cf6d31eb0..8e2784922e 100644 --- a/common/build.mk +++ b/common/build.mk @@ -73,7 +73,7 @@ common-$(CONFIG_HOSTCMD_GET_UPTIME_INFO)+=uptime.o common-$(CONFIG_HOSTCMD_RTC)+=rtc.o common-$(CONFIG_I2C_DEBUG)+=i2c_trace.o common-$(CONFIG_I2C_MASTER)+=i2c_master.o -common-$(CONFIG_I2C_SLAVE)+=i2c_slave.o +common-$(CONFIG_I2C_PERIPH)+=i2c_slave.o common-$(CONFIG_INDUCTIVE_CHARGING)+=inductive_charging.o common-$(CONFIG_KEYBOARD_PROTOCOL_8042)+=keyboard_8042.o \ keyboard_8042_sharedlib.o diff --git a/core/riscv-rv32i/ec.lds.S b/core/riscv-rv32i/ec.lds.S index 53e6b99599..f34822d909 100644 --- a/core/riscv-rv32i/ec.lds.S +++ b/core/riscv-rv32i/ec.lds.S @@ -28,7 +28,7 @@ MEMORY ILM (rx) : ORIGIN = FW_OFF(SECTION), LENGTH = FW_SIZE(SECTION) IRAM (rw) : ORIGIN = CONFIG_RAM_BASE + CHIP_RAM_SPACE_RESERVED, LENGTH = CONFIG_RAM_SIZE - CHIP_RAM_SPACE_RESERVED -#if defined(CONFIG_HOSTCMD_X86) || defined(CONFIG_I2C_SLAVE) +#if defined(CONFIG_HOSTCMD_X86) || defined(CONFIG_I2C_PERIPH) H2RAM (rw) : ORIGIN = CONFIG_H2RAM_BASE, LENGTH = CONFIG_H2RAM_SIZE #endif } @@ -243,13 +243,13 @@ SECTIONS __image_size = LOADADDR(.data) + SIZEOF(.data) + \ CHIP_ILM_BASE - FW_OFF(SECTION); -#if defined(CONFIG_HOSTCMD_X86) || defined(CONFIG_I2C_SLAVE) +#if defined(CONFIG_HOSTCMD_X86) || defined(CONFIG_I2C_PERIPH) .h2ram (NOLOAD) : { . += CONFIG_H2RAM_HOST_LPC_IO_BASE; *(.h2ram.pool.hostcmd) . = ALIGN(256); *(.h2ram.pool.acpiec) -#ifdef CONFIG_I2C_SLAVE +#ifdef CONFIG_I2C_PERIPH . = ALIGN(256); *(.h2ram.pool.i2cslv) #endif diff --git a/include/config.h b/include/config.h index 7defe5b6a3..063e3159e3 100644 --- a/include/config.h +++ b/include/config.h @@ -2163,7 +2163,7 @@ #undef CONFIG_I2C_MASTER /* EC uses an I2C slave interface */ -#undef CONFIG_I2C_SLAVE +#undef CONFIG_I2C_PERIPH /* Defines I2C operation retry count when slave nack'd(EC_ERROR_BUSY) */ #define CONFIG_I2C_NACK_RETRY_COUNT 0 |