From fd85931c6db4d236917d6fadcff2ccfd48109ab0 Mon Sep 17 00:00:00 2001 From: Tzung-Bi Shih Date: Thu, 24 Jun 2021 15:56:14 +0800 Subject: kukui_scp: remove unnecessary path when including BRANCH=none BUG=b:191835814 TEST=make BOARD=kukui_scp Signed-off-by: Tzung-Bi Shih Change-Id: I4d1d5ff1af9949357949c20163e6d755ce6f889b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2984254 Reviewed-by: Eric Yilun Lin --- board/kukui_scp/fd.c | 10 +++++----- board/kukui_scp/fd.h | 4 ++-- board/kukui_scp/isp_p1_srv.c | 6 +++--- board/kukui_scp/isp_p1_srv.h | 2 +- board/kukui_scp/isp_p2_srv.c | 10 +++++----- board/kukui_scp/isp_p2_srv.h | 2 +- board/kukui_scp/mdp_ipi_message.c | 7 +++---- board/kukui_scp/vdec.c | 8 ++++---- board/kukui_scp/vdec.h | 2 +- board/kukui_scp/venc.c | 8 ++++---- board/kukui_scp/venc.h | 2 +- 11 files changed, 30 insertions(+), 31 deletions(-) diff --git a/board/kukui_scp/fd.c b/board/kukui_scp/fd.c index 11f27cf945..237f15ca94 100644 --- a/board/kukui_scp/fd.c +++ b/board/kukui_scp/fd.c @@ -3,15 +3,15 @@ * found in the LICENSE file. */ -#include "chip/mt_scp/ipi_chip.h" -#include "chip/mt_scp/registers.h" #include "console.h" -#include "hooks.h" -#include "task.h" -#include "util.h" #include "fd.h" +#include "hooks.h" +#include "ipi_chip.h" #include "queue.h" #include "queue_policies.h" +#include "registers.h" +#include "task.h" +#include "util.h" #define CPRINTF(format, args...) cprintf(CC_IPI, format, ##args) #define CPRINTS(format, args...) cprints(CC_IPI, format, ##args) diff --git a/board/kukui_scp/fd.h b/board/kukui_scp/fd.h index 07554f7e15..3f70387400 100644 --- a/board/kukui_scp/fd.h +++ b/board/kukui_scp/fd.h @@ -6,9 +6,9 @@ #ifndef __CROS_EC_SCP_FD_H #define __CROS_EC_SCP_FD_H -#include "chip/mt_scp/registers.h" -#include "queue.h" #include "compile_time_macros.h" +#include "queue.h" +#include "registers.h" enum fd_msg_type { FD_IPI_MSG, diff --git a/board/kukui_scp/isp_p1_srv.c b/board/kukui_scp/isp_p1_srv.c index 92048f98c1..5c2ae7c2e9 100644 --- a/board/kukui_scp/isp_p1_srv.c +++ b/board/kukui_scp/isp_p1_srv.c @@ -3,15 +3,15 @@ * found in the LICENSE file. */ -#include "chip/mt_scp/ipi_chip.h" -#include "chip/mt_scp/registers.h" #include "console.h" #include "dma.h" #include "hooks.h" +#include "ipi_chip.h" #include "isp_p1_srv.h" -#include "task.h" #include "queue.h" #include "queue_policies.h" +#include "registers.h" +#include "task.h" #include "util.h" #define CPRINTS(format, args...) cprints(CC_IPI, format, ##args) diff --git a/board/kukui_scp/isp_p1_srv.h b/board/kukui_scp/isp_p1_srv.h index 6e262b55e4..ba6fa7d110 100644 --- a/board/kukui_scp/isp_p1_srv.h +++ b/board/kukui_scp/isp_p1_srv.h @@ -6,7 +6,7 @@ #ifndef __CROS_EC_ISP_P1_SRV_H #define __CROS_EC_ISP_P1_SRV_H -#include "chip/mt_scp/ipi_chip.h" +#include "ipi_chip.h" struct isp_msg { unsigned char id; diff --git a/board/kukui_scp/isp_p2_srv.c b/board/kukui_scp/isp_p2_srv.c index 5acb81ae0f..dba330c6a8 100755 --- a/board/kukui_scp/isp_p2_srv.c +++ b/board/kukui_scp/isp_p2_srv.c @@ -3,15 +3,15 @@ * found in the LICENSE file. */ -#include "isp_p2_srv.h" -#include "chip/mt_scp/ipi_chip.h" -#include "chip/mt_scp/registers.h" -#include "queue_policies.h" #include "console.h" #include "hooks.h" +#include "ipi_chip.h" +#include "isp_p2_srv.h" +#include "queue.h" +#include "queue_policies.h" +#include "registers.h" #include "task.h" #include "util.h" -#include "queue.h" #define CPRINTS(format, args...) cprints(CC_IPI, format, ##args) diff --git a/board/kukui_scp/isp_p2_srv.h b/board/kukui_scp/isp_p2_srv.h index 196de3e092..70fb0673de 100644 --- a/board/kukui_scp/isp_p2_srv.h +++ b/board/kukui_scp/isp_p2_srv.h @@ -6,7 +6,7 @@ #ifndef __CROS_EC_ISP_P2_SRV_H #define __CROS_EC_ISP_P2_SRV_H -#include "chip/mt_scp/ipi_chip.h" +#include "ipi_chip.h" struct dip_msg_service { unsigned char id; diff --git a/board/kukui_scp/mdp_ipi_message.c b/board/kukui_scp/mdp_ipi_message.c index a33048821f..eca40b741b 100644 --- a/board/kukui_scp/mdp_ipi_message.c +++ b/board/kukui_scp/mdp_ipi_message.c @@ -4,14 +4,13 @@ */ #include "console.h" +#include "ipi_chip.h" +#include "mdp_ipi_message.h" #include "queue_policies.h" +#include "registers.h" #include "task.h" #include "util.h" -#include "chip/mt_scp/ipi_chip.h" -#include "chip/mt_scp/registers.h" -#include "mdp_ipi_message.h" - #define CPRINTF(format, args...) cprintf(CC_IPI, format, ##args) #define CPRINTS(format, args...) cprints(CC_IPI, format, ##args) diff --git a/board/kukui_scp/vdec.c b/board/kukui_scp/vdec.c index 6ab257b08e..eb4f1f8fa1 100644 --- a/board/kukui_scp/vdec.c +++ b/board/kukui_scp/vdec.c @@ -3,15 +3,15 @@ * found in the LICENSE file. */ -#include "chip/mt_scp/ipi_chip.h" -#include "chip/mt_scp/registers.h" #include "console.h" #include "hooks.h" +#include "ipi_chip.h" +#include "queue.h" +#include "queue_policies.h" +#include "registers.h" #include "task.h" #include "util.h" #include "vdec.h" -#include "queue.h" -#include "queue_policies.h" #define CPRINTF(format, args...) cprintf(CC_IPI, format, ##args) #define CPRINTS(format, args...) cprints(CC_IPI, format, ##args) diff --git a/board/kukui_scp/vdec.h b/board/kukui_scp/vdec.h index 6e4c9b40e7..9cfb877e12 100644 --- a/board/kukui_scp/vdec.h +++ b/board/kukui_scp/vdec.h @@ -6,9 +6,9 @@ #ifndef __CROS_EC_SCP_VDEC_H #define __CROS_EC_SCP_VDEC_H -#include "chip/mt_scp/registers.h" #include "compile_time_macros.h" #include "queue.h" +#include "registers.h" enum vdec_type { VDEC_H264, diff --git a/board/kukui_scp/venc.c b/board/kukui_scp/venc.c index ef1df894a0..c7e19d120c 100644 --- a/board/kukui_scp/venc.c +++ b/board/kukui_scp/venc.c @@ -3,15 +3,15 @@ * found in the LICENSE file. */ -#include "chip/mt_scp/ipi_chip.h" -#include "chip/mt_scp/registers.h" #include "console.h" #include "hooks.h" +#include "ipi_chip.h" +#include "queue.h" +#include "queue_policies.h" +#include "registers.h" #include "task.h" #include "util.h" #include "venc.h" -#include "queue.h" -#include "queue_policies.h" #define CPRINTF(format, args...) cprintf(CC_IPI, format, ##args) #define CPRINTS(format, args...) cprints(CC_IPI, format, ##args) diff --git a/board/kukui_scp/venc.h b/board/kukui_scp/venc.h index 1172efd1b1..7046633046 100644 --- a/board/kukui_scp/venc.h +++ b/board/kukui_scp/venc.h @@ -6,9 +6,9 @@ #ifndef __CROS_EC_SCP_VENC_H #define __CROS_EC_SCP_VENC_H -#include "chip/mt_scp/registers.h" #include "compile_time_macros.h" #include "queue.h" +#include "registers.h" enum venc_type { VENC_H264, -- cgit v1.2.1