boards: Make firmware branch build again (some boards ran out of space)

BUG=none
BRANCH=hatch only
TEST=buildall

Change-Id: I1b18ac576fbae67ccbce5837965d9bfc22d898e8
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1982360

8 files changed, 23 insertions, 160 deletions

diff --git a/board/chell/board.h b/board/chell/board.h
index c11e9218fc..007fbbcbfd 100644
--- a/board/chell/board.h
+++ b/board/chell/board.h
@@ -70,11 +70,11 @@
 #define CONFIG_USB_CHARGER
 #define CONFIG_USB_MUX_PS8740
 #define CONFIG_USB_POWER_DELIVERY
-#define CONFIG_USB_PD_ALT_MODE
-#define CONFIG_USB_PD_ALT_MODE_DFP
+/*#define CONFIG_USB_PD_ALT_MODE
+  #define CONFIG_USB_PD_ALT_MODE_DFP*/
 #define CONFIG_USB_PD_COMM_LOCKED
 #define CONFIG_USB_PD_DUAL_ROLE
-#define CONFIG_USB_PD_LOGGING
+/*#define CONFIG_USB_PD_LOGGING*/
 #define CONFIG_USB_PD_PORT_MAX_COUNT 2
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_USB_PD_TRY_SRC
diff --git a/board/chell/usb_pd_policy.c b/board/chell/usb_pd_policy.c
index b2e8de464f..52c73b7500 100644
--- a/board/chell/usb_pd_policy.c
+++ b/board/chell/usb_pd_policy.c
@@ -24,19 +24,6 @@
 #define PDO_FIXED_FLAGS (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |\
 			 PDO_FIXED_COMM_CAP)
 
-/* TODO: fill in correct source and sink capabilities */
-const uint32_t pd_src_pdo[] = {
-		PDO_FIXED(5000, 1500, PDO_FIXED_FLAGS),
-};
-const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo);
-
-const uint32_t pd_snk_pdo[] = {
-		PDO_FIXED(5000, 500, PDO_FIXED_FLAGS),
-		PDO_BATT(4750, 21000, 15000),
-		PDO_VAR(4750, 21000, 3000),
-};
-const int pd_snk_pdo_cnt = ARRAY_SIZE(pd_snk_pdo);
-
 int pd_is_valid_input_voltage(int mv)
 {
 	return 1;
diff --git a/board/endeavour/board.h b/board/endeavour/board.h
index c9c54d3838..2e28d45e8a 100644
--- a/board/endeavour/board.h
+++ b/board/endeavour/board.h
@@ -15,6 +15,11 @@
 #undef  CONFIG_SYSTEM_UNLOCKED
 #define CONFIG_USB_PD_COMM_LOCKED
 
+#define PD_MAX_VOLTAGE_MV 5000
+#define PD_OPERATING_POWER_MW 5000
+#define PD_MAX_CURRENT_MA 1000
+#define PD_MAX_POWER_MW 5000
+
 /* EC */
 #define CONFIG_ADC
 #define CONFIG_BOARD_VERSION_CBI
@@ -85,10 +90,10 @@
 #define CONFIG_TEMP_SENSOR_TMP432
 
 /* USB */
-#define CONFIG_USB_PD_ALT_MODE
-#define CONFIG_USB_PD_ALT_MODE_DFP
+/*#define CONFIG_USB_PD_ALT_MODE
+  #define CONFIG_USB_PD_ALT_MODE_DFP*/
 #define CONFIG_USB_PD_DISCHARGE_TCPC
-#define CONFIG_USB_PD_LOGGING
+/*#define CONFIG_USB_PD_LOGGING*/
 #define CONFIG_USB_PD_PORT_MAX_COUNT 1
 #define CONFIG_USB_PD_VBUS_DETECT_GPIO
 #define CONFIG_USB_PD_TCPM_MUX
diff --git a/board/endeavour/usb_pd_policy.c b/board/endeavour/usb_pd_policy.c
index 2090184604..aa163a9129 100644
--- a/board/endeavour/usb_pd_policy.c
+++ b/board/endeavour/usb_pd_policy.c
@@ -25,15 +25,9 @@
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
 
-#define PDO_FIXED_FLAGS (PDO_FIXED_EXTERNAL | \
-			 PDO_FIXED_DATA_SWAP | \
+#define PDO_FIXED_FLAGS (PDO_FIXED_DATA_SWAP | \
 			 PDO_FIXED_COMM_CAP)
 
-const uint32_t pd_src_pdo[] = {
-	PDO_FIXED(5000, 3000, PDO_FIXED_FLAGS),
-};
-const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo);
-
 void pd_transition_voltage(int idx)
 {
 	/* No-operation: we are always 5V */
@@ -168,136 +162,6 @@ int pd_custom_vdm(int port, int cnt, uint32_t *payload,
 	return 0;
 }
 
-static int dp_flags[CONFIG_USB_PD_PORT_MAX_COUNT];
-static uint32_t dp_status[CONFIG_USB_PD_PORT_MAX_COUNT];
-
-static void svdm_safe_dp_mode(int port)
-{
-	/* make DP interface safe until configure */
-	dp_flags[port] = 0;
-	dp_status[port] = 0;
-	usb_mux_set(port, TYPEC_MUX_NONE,
-		USB_SWITCH_CONNECT, pd_get_polarity(port));
-}
-
-static int svdm_enter_dp_mode(int port, uint32_t mode_caps)
-{
-	/* Only enter mode if device is DFP_D capable */
-	if (mode_caps & MODE_DP_SNK) {
-		pd_log_event(PD_EVENT_VIDEO_DP_MODE,
-			     PD_LOG_PORT_SIZE(port, 0), 1, NULL);
-		svdm_safe_dp_mode(port);
-		return 0;
-	}
-
-	return -1;
-}
-
-static int svdm_dp_status(int port, uint32_t *payload)
-{
-	int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT);
-
-	payload[0] = VDO(USB_SID_DISPLAYPORT, 1,
-			 CMD_DP_STATUS | VDO_OPOS(opos));
-	payload[1] = VDO_DP_STATUS(0, /* HPD IRQ  ... not applicable */
-				   0, /* HPD level ... not applicable */
-				   0, /* exit DP? ... no */
-				   0, /* usb mode? ... no */
-				   0, /* multi-function ... no */
-				   (!!(dp_flags[port] & DP_FLAGS_DP_ON)),
-				   0, /* power low? ... no */
-				   (!!(dp_flags[port] & DP_FLAGS_DP_ON)));
-	return 2;
-};
-
-static int svdm_dp_config(int port, uint32_t *payload)
-{
-	int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT);
-	int mf_pref = PD_VDO_DPSTS_MF_PREF(dp_status[port]);
-	int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]);
-
-	if (!pin_mode)
-		return 0;
-
-	usb_mux_set(port, mf_pref ? TYPEC_MUX_DOCK : TYPEC_MUX_DP,
-		    USB_SWITCH_CONNECT, pd_get_polarity(port));
-
-	payload[0] = VDO(USB_SID_DISPLAYPORT, 1,
-			 CMD_DP_CONFIG | VDO_OPOS(opos));
-	payload[1] = VDO_DP_CFG(pin_mode,      /* pin mode */
-				1,             /* DPv1.3 signaling */
-				2);            /* UFP connected */
-	return 2;
-};
-
-static void svdm_dp_post_config(int port)
-{
-	const struct usb_mux *mux = &usb_muxes[port];
-
-	dp_flags[port] |= DP_FLAGS_DP_ON;
-	if (!(dp_flags[port] & DP_FLAGS_HPD_HI_PENDING))
-		return;
-	mux->hpd_update(port, 1, 0);
-}
-
-static int svdm_dp_attention(int port, uint32_t *payload)
-{
-	int lvl = PD_VDO_DPSTS_HPD_LVL(payload[1]);
-	int irq = PD_VDO_DPSTS_HPD_IRQ(payload[1]);
-	const struct usb_mux *mux = &usb_muxes[port];
-
-	dp_status[port] = payload[1];
-	if (!(dp_flags[port] & DP_FLAGS_DP_ON)) {
-		if (lvl)
-			dp_flags[port] |= DP_FLAGS_HPD_HI_PENDING;
-		return 1;
-	}
-	mux->hpd_update(port, lvl, irq);
-
-	/* ack */
-	return 1;
-}
-
-static void svdm_exit_dp_mode(int port)
-{
-	const struct usb_mux *mux = &usb_muxes[port];
-
-	pd_log_event(PD_EVENT_VIDEO_DP_MODE,
-		     PD_LOG_PORT_SIZE(port, 0), 0, NULL);
-	svdm_safe_dp_mode(port);
-	mux->hpd_update(port, 0, 0);
-}
-
-static int svdm_enter_gfu_mode(int port, uint32_t mode_caps)
-{
-	/* Always enter GFU mode */
-	return 0;
-}
-
-static void svdm_exit_gfu_mode(int port)
-{
-}
-
-static int svdm_gfu_status(int port, uint32_t *payload)
-{
-	/*
-	 * This is called after enter mode is successful, send unstructured
-	 * VDM to read info.
-	 */
-	pd_send_vdm(port, USB_VID_GOOGLE, VDO_CMD_READ_INFO, NULL, 0);
-	return 0;
-}
-
-static int svdm_gfu_config(int port, uint32_t *payload)
-{
-	return 0;
-}
-
-static int svdm_gfu_attention(int port, uint32_t *payload)
-{
-	return 0;
-}
-
 const struct svdm_amode_fx supported_modes[] = {
 	{
 		.svid = USB_SID_DISPLAYPORT,
diff --git a/board/flapjack/board.h b/board/flapjack/board.h
index 26d299f1b9..7bb87275d0 100644
--- a/board/flapjack/board.h
+++ b/board/flapjack/board.h
@@ -156,10 +156,11 @@
 #ifdef SECTION_IS_RO
 #define CONFIG_USB_PD_DEBUG_LEVEL 0
 #endif
-
+/*
 #define CONFIG_BATTERY_CUT_OFF
 #define CONFIG_BATTERY_PRESENT_CUSTOM
 #define CONFIG_BATTERY_REVIVE_DISCONNECT
+*/
 #define CONFIG_BATTERY_MAX17055
 #define CONFIG_BATTERY_MAX17055_ALERT
 #define CONFIG_BATTERY_MAX17055_FULL_MODEL
diff --git a/board/glados/board.h b/board/glados/board.h
index eb970b5bfb..a13490a21f 100644
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -19,7 +19,9 @@
 #define CONFIG_ACCEL_KX022
 #define CONFIG_ADC
 #define CONFIG_ALS_OPT3001
+/*
 #define CONFIG_BATTERY_CUT_OFF
+*/
 #define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L
 #define CONFIG_BATTERY_SMART
 #define CONFIG_BOARD_VERSION_GPIO
diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h
index d109d48837..429b4e07eb 100644
--- a/board/servo_v4/board.h
+++ b/board/servo_v4/board.h
@@ -25,7 +25,7 @@
 #define CONFIG_STREAM_USART3
 #define CONFIG_STREAM_USART4
 #define CONFIG_STREAM_USB
-#define CONFIG_CMD_USART_INFO
+/*#define CONFIG_CMD_USART_INFO*/
 
 /* Optional features */
 #define CONFIG_STM_HWTIMER32
@@ -62,7 +62,7 @@
 #define USB_EP_COUNT		7
 
 /* Enable console recasting of GPIO type. */
-#define CONFIG_CMD_GPIO_EXTENDED
+/*#define CONFIG_CMD_GPIO_EXTENDED*/
 
 /* This is not actually an EC so disable some features. */
 #undef CONFIG_WATCHDOG_HELP
@@ -74,10 +74,12 @@
 #undef CONFIG_CONSOLE_HISTORY
 #undef CONFIG_CMD_CRASH
 #undef CONFIG_CMD_ACCELSPOOF
+#undef CONFIG_CMD_BATTFAKE
 #undef CONFIG_CMD_FASTCHARGE
 #undef CONFIG_CMD_FLASHINFO
 #undef CONFIG_CMD_GETTIME
 #undef CONFIG_CMD_MEM
+#undef CONFIG_CMD_RETIMER
 #undef CONFIG_CMD_SHMEM
 #undef CONFIG_CMD_SYSLOCK
 #undef CONFIG_CMD_TIMERINFO
@@ -102,7 +104,7 @@
 #define CONFIG_CHARGE_MANAGER
 #undef  CONFIG_CHARGE_MANAGER_SAFE_MODE
 #define CONFIG_USB_POWER_DELIVERY
-#define CONFIG_CMD_PD
+/*#define CONFIG_CMD_PD*/
 #define CONFIG_USB_PD_CUSTOM_PDO
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_DYNAMIC_SRC_CAP
diff --git a/board/volteer/board.h b/board/volteer/board.h
index 06d13e1526..f9f0a3cf09 100644
--- a/board/volteer/board.h
+++ b/board/volteer/board.h
@@ -22,6 +22,8 @@
 
 #define CONFIG_POWER_BUTTON
 
+#define CONFIG_USB_PD_ALT_MODE_DFP
+
 /*
  * USB ID
  * TODO(b/140578872): Figure out what volteer's is.