From fb08e0bf9dd370fc4ae1ce75dad890aa14be668e Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Mon, 19 Aug 2019 17:24:07 +0800 Subject: baseboard/intelrvp: Avoid including "usb_pd_tcpm.h" from baseboard.h board/tglrvpu_ite/board.h includes baseboard.h, which includes usb_pd_tcpm.h, which includes ec_commands.h, which includes board.h again, leading to compilation failure in CL:1535086. This patch breaks the circular dependency by removing "usb_pd_tcpm.h" inclusion in baseboard.h. To make baseboard/intelrvp/retimer.c compilable, "compile_time_macros.h" is also included since it is where BUILD_ASSERT is defined. BRANCH=none BUG=b:109900671,b:118654976 TEST=make buildall -j Change-Id: Ifdf6594f4eb3a2f732bc5979c0fbb0c79ee15ddf Signed-off-by: Yu-Ping Wu Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1760656 Commit-Queue: Hung-Te Lin Reviewed-by: Daisuke Nojiri --- baseboard/intelrvp/baseboard.h | 1 - baseboard/intelrvp/retimer.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'baseboard') diff --git a/baseboard/intelrvp/baseboard.h b/baseboard/intelrvp/baseboard.h index 016c7543f0..7b24e594c8 100644 --- a/baseboard/intelrvp/baseboard.h +++ b/baseboard/intelrvp/baseboard.h @@ -148,7 +148,6 @@ #include "gpio_signal.h" #include "module_id.h" #include "registers.h" -#include "usb_pd_tcpm.h" /* PWM channels */ enum pwm_channel { diff --git a/baseboard/intelrvp/retimer.c b/baseboard/intelrvp/retimer.c index eb5728693f..54c350017e 100644 --- a/baseboard/intelrvp/retimer.c +++ b/baseboard/intelrvp/retimer.c @@ -6,6 +6,7 @@ /* Intel BASEBOARD-RVP Retimer specific configuration */ #include "bb_retimer.h" +#include "compile_time_macros.h" #include "common.h" /* USB Retimers configuration */ -- cgit v1.2.1