diff options
| author | Vijay Hiremath <vijay.p.hiremath@intel.com> | 2020-01-22 12:15:23 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-14 02:59:20 +0000 |
| commit | d595bddb4c6576c9f5611d3a42c71424ebd3c1d7 (patch) | |
| tree | 70027e3b49aa9fd9f3be6646d2f31aa4d8b55cc2 | |
| parent | 1053611f0a319dae5aea5ac8452d04ca57376987 (diff) | |
| download | chrome-ec-d595bddb4c6576c9f5611d3a42c71424ebd3c1d7.tar.gz | |
intelrvp: Correct build assert array size comparison
BUG=none
BRANCH=none
TEST=make buildall -j
Change-Id: I8eab72a146dd410af4f5e5c056f3393766284c5e
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2055884
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
| -rw-r--r-- | baseboard/intelrvp/bc12.c | 2 | ||||
| -rw-r--r-- | baseboard/intelrvp/ite_ec.c | 2 | ||||
| -rw-r--r-- | baseboard/intelrvp/retimer.c | 2 | ||||
| -rw-r--r-- | baseboard/intelrvp/usb_mux.c | 4 | ||||
| -rw-r--r-- | board/jslrvp_ite/board.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/baseboard/intelrvp/bc12.c b/baseboard/intelrvp/bc12.c index 5a5807a325..9f212fba4e 100644 --- a/baseboard/intelrvp/bc12.c +++ b/baseboard/intelrvp/bc12.c @@ -10,7 +10,7 @@ /* BC1.2 chip Configuration */ #ifdef CONFIG_BC12_DETECT_MAX14637 -const struct max14637_config_t max14637_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct max14637_config_t max14637_config[] = { [TYPE_C_PORT_0] = { .chip_enable_pin = GPIO_USB_C0_BC12_VBUS_ON_ODL, .chg_det_pin = GPIO_USB_C0_BC12_CHG_DET_L, diff --git a/baseboard/intelrvp/ite_ec.c b/baseboard/intelrvp/ite_ec.c index 2faa17ad08..2a847e5132 100644 --- a/baseboard/intelrvp/ite_ec.c +++ b/baseboard/intelrvp/ite_ec.c @@ -14,7 +14,7 @@ #include "usb_pd_tcpm.h" /* USB-C TPCP Configuration */ -const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct tcpc_config_t tcpc_config[] = { [TYPE_C_PORT_0] = { .bus_type = EC_BUS_TYPE_EMBEDDED, /* TCPC is embedded within EC so no i2c config needed */ diff --git a/baseboard/intelrvp/retimer.c b/baseboard/intelrvp/retimer.c index 7617883ef2..a444806062 100644 --- a/baseboard/intelrvp/retimer.c +++ b/baseboard/intelrvp/retimer.c @@ -29,7 +29,7 @@ const struct bb_usb_control bb_controls[] = { }; BUILD_ASSERT(ARRAY_SIZE(bb_controls) == CONFIG_USB_PD_PORT_MAX_COUNT); -struct usb_retimer usb_retimers[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_retimer usb_retimers[] = { [TYPE_C_PORT_0] = { .driver = &bb_usb_retimer, .i2c_port = I2C_PORT0_BB_RETIMER, diff --git a/baseboard/intelrvp/usb_mux.c b/baseboard/intelrvp/usb_mux.c index 65448f5992..2dee2bf759 100644 --- a/baseboard/intelrvp/usb_mux.c +++ b/baseboard/intelrvp/usb_mux.c @@ -12,7 +12,7 @@ /* USB muxes Configuration */ #ifdef CONFIG_USB_MUX_VIRTUAL -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux usb_muxes[] = { [TYPE_C_PORT_0] = { .driver = &virtual_usb_mux_driver, .hpd_update = &virtual_hpd_update, @@ -28,7 +28,7 @@ BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == CONFIG_USB_PD_PORT_MAX_COUNT); #endif /* CONFIG_USB_MUX_VIRTUAL */ #ifdef CONFIG_USB_MUX_ANX7440 -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { +struct usb_mux usb_muxes[] = { [TYPE_C_PORT_0] = { .port_addr = I2C_ADDR_USB_MUX0_FLAGS, .driver = &anx7440_usb_mux_driver, diff --git a/board/jslrvp_ite/board.c b/board/jslrvp_ite/board.c index ccf4a5cd41..bb41fedcc9 100644 --- a/board/jslrvp_ite/board.c +++ b/board/jslrvp_ite/board.c @@ -25,7 +25,7 @@ #define CPRINTF(format, args...) cprintf(CC_COMMAND, format, ## args) /* TCPC gpios */ -const struct tcpc_gpio_config_t tcpc_gpios[CONFIG_USB_PD_PORT_MAX_COUNT] = { +const struct tcpc_gpio_config_t tcpc_gpios[] = { [TYPE_C_PORT_0] = { .vbus = { .pin = GPIO_USB_C0_VBUS_INT, |