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 /common/system.c | |
| 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 'common/system.c')
| -rw-r--r-- | common/system.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |