diff options
| author | Patryk Duda <pdk@semihalf.com> | 2023-03-01 13:25:44 +0100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-01 23:02:43 +0000 |
| commit | c6e6f94b94243f1d462b4972d7ae64dbfd2e3635 (patch) | |
| tree | abc07aa1f1f394b7eea84a6cf9f2586bc72b6ba0 /chip | |
| parent | 670b102d71c34cc3a906ab16797731073dba9dc8 (diff) | |
| download | chrome-ec-c6e6f94b94243f1d462b4972d7ae64dbfd2e3635.tar.gz | |
Replace CONFIG_DMA with CONFIG_DMA_CROS in EC codebase
The config from EC collides with the same config from Zephyr.
BUG=b:239712345
BRANCH=none
TEST=make runhosttests buildall
Change-Id: Ic6e63ea6dd9e745e82feb2af04b77069c2d78af1
Signed-off-by: Patryk Duda <pdk@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4295699
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Commit-Queue: Patryk Duda <patrykd@google.com>
Tested-by: Patryk Duda <patrykd@google.com>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/mchp/build.mk | 2 | ||||
| -rw-r--r-- | chip/mchp/config_chip.h | 2 | ||||
| -rw-r--r-- | chip/stm32/build.mk | 2 | ||||
| -rw-r--r-- | chip/stm32/config_chip.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/chip/mchp/build.mk b/chip/mchp/build.mk index 87e37b91e5..972dd972ae 100644 --- a/chip/mchp/build.mk +++ b/chip/mchp/build.mk @@ -31,7 +31,7 @@ endif # Required chip modules chip-y=clock.o gpio.o hwtimer.o system.o uart.o port80.o tfdp.o chip-$(CONFIG_ADC)+=adc.o -chip-$(CONFIG_DMA)+=dma.o +chip-$(CONFIG_DMA_CROS)+=dma.o chip-$(CONFIG_HOST_INTERFACE_ESPI)+=espi.o chip-$(CONFIG_FANS)+=fan.o chip-$(CONFIG_FLASH_PHYSICAL)+=flash.o diff --git a/chip/mchp/config_chip.h b/chip/mchp/config_chip.h index 4d5836ef42..fbd1a3565b 100644 --- a/chip/mchp/config_chip.h +++ b/chip/mchp/config_chip.h @@ -167,7 +167,7 @@ /* Customize the build */ /* Optional features present on this chip */ #define CONFIG_ADC -#define CONFIG_DMA +#define CONFIG_DMA_CROS #define CONFIG_HOSTCMD_X86 #define CONFIG_SPI #define CONFIG_SWITCH diff --git a/chip/stm32/build.mk b/chip/stm32/build.mk index 72984eec5f..41ceaeb12c 100644 --- a/chip/stm32/build.mk +++ b/chip/stm32/build.mk @@ -36,7 +36,7 @@ endif DMA_TYPE=$(if $(CHIP_FAMILY_STM32F4)$(CHIP_FAMILY_STM32H7),-stm32f4,) SPI_TYPE=$(if $(CHIP_FAMILY_STM32H7),-stm32h7,) -chip-$(CONFIG_DMA)+=dma$(DMA_TYPE).o +chip-$(CONFIG_DMA_CROS)+=dma$(DMA_TYPE).o chip-$(CONFIG_COMMON_RUNTIME)+=bkpdata.o system.o chip-y+=clock-$(CHIP_FAMILY).o ifeq ($(CHIP_FAMILY),$(filter $(CHIP_FAMILY),stm32f0 stm32f3 stm32f4)) diff --git a/chip/stm32/config_chip.h b/chip/stm32/config_chip.h index f85eef5c46..f6f211f4a5 100644 --- a/chip/stm32/config_chip.h +++ b/chip/stm32/config_chip.h @@ -140,7 +140,7 @@ #define CONFIG_WATCHDOG_HELP /* Use DMA */ -#define CONFIG_DMA +#define CONFIG_DMA_CROS /* STM32 features RTC (optional feature) */ #define CONFIG_RTC |