From 17844811db11c6d61a6b9176662cd9edb42cd9a4 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Fri, 26 Jan 2024 22:12:06 +0200 Subject: [PATCH] zephyr: interrupt.h: conditionally include drivers/interrupt.h NXP's i.MX8 and Intel's CAVS are the only platforms using Zephyr that also require the usage of drivers/interrupt.h. Since for i.MX8 platforms drivers/interrupt.h is included through xtos/rtos/interrupt.h, add a macro guard around the inclusion of drivers/interrupt.h which will allow the other Zephyr platforms (i.e: NXP's i.MX93 and Intel's ACE) to finally remove the SOF-specific drivers/interrupt.h. This is desired because the platforms should only rely on the Zephyr interrupt support instead of having to use a hybrid between Zephyr and SOF interrupt support. Signed-off-by: Laurentiu Mihalcea --- zephyr/include/rtos/interrupt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zephyr/include/rtos/interrupt.h b/zephyr/include/rtos/interrupt.h index 788abfcf3..b9559c89b 100644 --- a/zephyr/include/rtos/interrupt.h +++ b/zephyr/include/rtos/interrupt.h @@ -19,9 +19,11 @@ #include +#ifdef CONFIG_CAVS /* to be removed once driver upstream in Zephyr */ #define __SOF_DRIVERS_INTERRUPT_H__ #include +#endif /* CONFIG_CAVS */ extern struct tr_ctx zephyr_tr;