summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/berknip/board.h2
-rw-r--r--board/dalboz/board.h3
-rw-r--r--board/dirinboz/board.h3
-rw-r--r--board/ezkinil/board.h2
-rw-r--r--board/gumboz/board.h3
-rw-r--r--board/morphius/board.h2
-rw-r--r--board/shuboz/board.h4
-rw-r--r--board/trembyle/board.h2
-rw-r--r--board/vilboz/board.h3
-rw-r--r--board/woomax/board.h3
10 files changed, 16 insertions, 11 deletions
diff --git a/board/berknip/board.h b/board/berknip/board.h
index bad24c95ac..368084fa25 100644
--- a/board/berknip/board.h
+++ b/board/berknip/board.h
@@ -99,7 +99,6 @@ enum usba_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* BERKNIP_MB_USBAC
@@ -146,6 +145,7 @@ enum ec_cfg_usb_db_type {
BERKNIP_DB_T_OPT3_USBAC_HDMI_MSTHUB = 1,
};
+#include "cbi_ec_fw_config.h"
#define HAS_USBC1_RETIMER_PS8743 \
(BIT(BERKNIP_DB_T_OPT3_USBAC_HDMI_MSTHUB))
diff --git a/board/dalboz/board.h b/board/dalboz/board.h
index 845048225d..d2a48dceb6 100644
--- a/board/dalboz/board.h
+++ b/board/dalboz/board.h
@@ -126,7 +126,6 @@ enum usbc_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* DALBOZ_MB_USBAC
@@ -169,6 +168,8 @@ enum ec_cfg_usb_db_type {
DALBOZ_DB_D_OPT2_USBA_HDMI = 1,
};
+#include "cbi_ec_fw_config.h"
+
#define HAS_USBC1 \
(BIT(DALBOZ_DB_D_OPT1_USBAC))
diff --git a/board/dirinboz/board.h b/board/dirinboz/board.h
index 516988d005..0da2465f0d 100644
--- a/board/dirinboz/board.h
+++ b/board/dirinboz/board.h
@@ -129,7 +129,6 @@ enum usbc_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* DALBOZ_MB_USBAC
@@ -162,6 +161,8 @@ enum ec_cfg_usb_db_type {
DIRINBOZ_DB_OPT1_USBC = 0,
};
+#include "cbi_ec_fw_config.h"
+
static inline bool ec_config_has_hdmi_retimer_pi3hdx1204(void)
{
return 0;
diff --git a/board/ezkinil/board.h b/board/ezkinil/board.h
index 9a7e63af9a..a7b9e05f61 100644
--- a/board/ezkinil/board.h
+++ b/board/ezkinil/board.h
@@ -103,7 +103,6 @@ enum usba_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* EZKINIL_MB_USBAC
@@ -148,6 +147,7 @@ enum ec_cfg_usb_db_type {
EZKINIL_DB_T_OPT2_USBAC = 1,
};
+#include "cbi_ec_fw_config.h"
#define HAS_USBA1_RETIMER_TUSB522 \
(BIT(EZKINIL_DB_T_OPT2_USBAC))
diff --git a/board/gumboz/board.h b/board/gumboz/board.h
index d82df23808..73b8b741fe 100644
--- a/board/gumboz/board.h
+++ b/board/gumboz/board.h
@@ -132,7 +132,6 @@ enum usbc_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* DALBOZ_MB_USBAC
@@ -165,6 +164,8 @@ enum ec_cfg_usb_db_type {
GUMBOZ_DB_OPT1_USBC = 0,
};
+#include "cbi_ec_fw_config.h"
+
static inline bool ec_config_has_hdmi_retimer_pi3hdx1204(void)
{
return 0;
diff --git a/board/morphius/board.h b/board/morphius/board.h
index fad19f1948..ec062011c7 100644
--- a/board/morphius/board.h
+++ b/board/morphius/board.h
@@ -126,7 +126,6 @@ enum usba_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* MORPHIUS_MB_USBAC
@@ -170,6 +169,7 @@ enum ec_cfg_usb_db_type {
MORPHIUS_DB_T_OPT3_USBC_HDMI_MSTHUB = 1,
};
+#include "cbi_ec_fw_config.h"
#define HAS_USBC1_RETIMER_PS8802 \
(BIT(MORPHIUS_DB_T_OPT3_USBC_HDMI_MSTHUB))
diff --git a/board/shuboz/board.h b/board/shuboz/board.h
index a15d03e454..09fef32dd5 100644
--- a/board/shuboz/board.h
+++ b/board/shuboz/board.h
@@ -128,8 +128,6 @@ enum usbc_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
-
/**
* SHUBOZ_MB_USBAC
* USB-A0 Speed: 5 Gbps
@@ -161,6 +159,8 @@ enum ec_cfg_usb_db_type {
SHUBOZ_DB_D_OPT1_USBAC = 0,
};
+#include "cbi_ec_fw_config.h"
+
void board_reset_pd_mcu(void);
/* Common definition for the USB PD interrupt handlers. */
diff --git a/board/trembyle/board.h b/board/trembyle/board.h
index 4cb79f4188..bfbd829ac1 100644
--- a/board/trembyle/board.h
+++ b/board/trembyle/board.h
@@ -94,7 +94,6 @@ enum usba_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* TREMBYLE_MB_USBAC
@@ -153,6 +152,7 @@ enum ec_cfg_usb_db_type {
TREMBYLE_DB_T_OPT3_USBAC_HDMI_MSTHUB = 2,
};
+#include "cbi_ec_fw_config.h"
#define HAS_USBC1_RETIMER_PS8802 \
(BIT(TREMBYLE_DB_T_OPT2_USBAC) | \
diff --git a/board/vilboz/board.h b/board/vilboz/board.h
index 33ecda9b30..500299eda6 100644
--- a/board/vilboz/board.h
+++ b/board/vilboz/board.h
@@ -130,7 +130,6 @@ enum usbc_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* VILBOZ_MB_USBAC
@@ -158,6 +157,8 @@ enum ec_cfg_usb_db_type {
VILBOZ_DB_D_OPT1_USBA_HDMI = 0,
};
+#include "cbi_ec_fw_config.h"
+
void board_reset_pd_mcu(void);
/* Common definition for the USB PD interrupt handlers. */
diff --git a/board/woomax/board.h b/board/woomax/board.h
index a172df906a..10b51cfc1e 100644
--- a/board/woomax/board.h
+++ b/board/woomax/board.h
@@ -114,7 +114,6 @@ enum usba_port {
/*****************************************************************************
* CBI EC FW Configuration
*/
-#include "cbi_ec_fw_config.h"
/**
* WOOMAX_MB_USBAC
@@ -156,6 +155,8 @@ enum ec_cfg_usb_db_type {
WOOMAX_DB_T_OPT3_USBAC_HDMI_MSTHUB = 1,
};
+#include "cbi_ec_fw_config.h"
+
#define HAS_USBC1_RETIMER_PS8802 \
(BIT(WOOMAX_DB_T_OPT3_USBAC_HDMI_MSTHUB))