From c6e6f94b94243f1d462b4972d7ae64dbfd2e3635 Mon Sep 17 00:00:00 2001 From: Patryk Duda Date: Wed, 1 Mar 2023 13:25:44 +0100 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4295699 Reviewed-by: Keith Short Reviewed-by: Tom Hughes Commit-Queue: Patryk Duda Tested-by: Patryk Duda --- common/system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/system.c') diff --git a/common/system.c b/common/system.c index 2ad2e4310b..78bfd58b6a 100644 --- a/common/system.c +++ b/common/system.c @@ -629,10 +629,10 @@ test_mockable_static void jump_to_image(uintptr_t init_addr) /* Disable interrupts before jump */ interrupt_disable_all(); -#ifdef CONFIG_DMA +#ifdef CONFIG_DMA_CROS /* Disable all DMA channels to avoid memory corruption */ dma_disable_all(); -#endif /* CONFIG_DMA */ +#endif /* CONFIG_DMA_CROS */ /* Jump to the reset vector */ resetvec = (void (*)(void))init_addr; -- cgit v1.2.1