kevin / gru: Reduce SRAM footprint

Remove console commands and add CONFIG options to reduce RAM usage.

BUG=chrome-os-partner:54099
BRANCH=gru
TEST=Verify charge_ramp CONFIG + task builds for gru.

Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I2d7bc77d1fc032c6cb75eb1ec8d13dacb676658d
Reviewed-on: https://chromium-review.googlesource.com/437662
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

5 files changed, 27 insertions, 56 deletions

diff --git a/board/kevin/board.h b/board/kevin/board.h
index 6304d351eb..a12844249f 100644
--- a/board/kevin/board.h
+++ b/board/kevin/board.h
@@ -12,6 +12,7 @@
 #define CONFIG_ADC
 #define CONFIG_CHIPSET_RK3399
 #define CONFIG_CMD_RTC
+#define CONFIG_FPU
 #define CONFIG_HOSTCMD_RTC
 #define CONFIG_HOSTCMD_SPS
 #define CONFIG_I2C
@@ -77,7 +78,7 @@
 
 /* Increase tx buffer size, as we'd like to stream EC log to AP. */
 #undef CONFIG_UART_TX_BUF_SIZE
-#define CONFIG_UART_TX_BUF_SIZE 4096
+#define CONFIG_UART_TX_BUF_SIZE 2048
 
 /* Sensors */
 #define CONFIG_ACCEL_BMA255
@@ -156,17 +157,10 @@
 #define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000  /* us */
 #define PD_VCONN_SWAP_DELAY 5000 /* us */
 
-/* Optional features for test commands */
-#define CONFIG_CMD_CHARGER_PSYS
-
 #ifdef BOARD_GRU
 #define CONFIG_CMD_ALS
 #endif
 
-/* Set PSYS gain for 50W max measurement */
-#define BD9995X_PSYS_GAIN_SELECT \
-		BD9995X_CMD_PMON_IOUT_CTRL_SET_PMON_GAIN_SET_08UAW
-
 #define CONFIG_UART_HOST                0
 
 /* Optional feature - used by nuvoton */
@@ -182,18 +176,19 @@
 #undef  CONFIG_PSTORE
 
 /* Reduce code size */
-#ifdef BOARD_GRU
 #define CONFIG_COMMON_GPIO_SHORTNAMES
 #define GPIO_NAME_BY_PIN(port, index) #port#index
-#endif
+#undef  CONFIG_CONSOLE_VERBOSE
 
 #define CONFIG_HOSTCMD_ALIGNED
 
 /* Modules we want to exclude */
+#undef CONFIG_CMD_BATTFAKE
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_HASH
 #undef CONFIG_CMD_I2C_SCAN
 #undef CONFIG_CMD_MD
+#undef CONFIG_CMD_MMAPINFO
 #undef CONFIG_CMD_POWERINDEBUG
 #undef CONFIG_CMD_TIMERINFO
 #undef CONFIG_CONSOLE_CMDHELP
diff --git a/board/kevin/led_kevin.c b/board/kevin/led_kevin.c
index a06c1553ef..2dda9499e8 100644
--- a/board/kevin/led_kevin.c
+++ b/board/kevin/led_kevin.c
@@ -142,31 +142,3 @@ static void led_tick(void)
 	}
 }
 DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT);
-
-/******************************************************************/
-/* Console commands */
-static int command_led_color(int argc, char **argv)
-{
-	if (argc > 1) {
-		if (!strcasecmp(argv[1], "debug")) {
-			led_debug ^= 1;
-			CPRINTF("led_debug = %d\n", led_debug);
-		} else if (!strcasecmp(argv[1], "off")) {
-			set_color(LED_OFF);
-		} else if (!strcasecmp(argv[1], "red")) {
-			set_color(LED_RED);
-		} else if (!strcasecmp(argv[1], "green")) {
-			set_color(LED_GREEN);
-		} else if (!strcasecmp(argv[1], "blue")) {
-			set_color(LED_BLUE);
-		} else {
-			/* maybe handle charger_discharge_on_ac() too? */
-			return EC_ERROR_PARAM1;
-		}
-	}
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(ledcolor, command_led_color,
-			"[debug|red|green|blue|off]",
-			"Change LED color");
diff --git a/chip/npcx/flash.c b/chip/npcx/flash.c
index 6d54b61126..4921e5200f 100644
--- a/chip/npcx/flash.c
+++ b/chip/npcx/flash.c
@@ -58,12 +58,6 @@ static void flash_pinmux(int enable)
 	}
 }
 
-static void flash_tristate(int enable)
-{
-	/* Enable/Disable FIU pins to tri-state */
-	UPDATE_BIT(NPCX_DEVCNT, NPCX_DEVCNT_F_SPI_TRIS, enable);
-}
-
 static void flash_execute_cmd(uint8_t code, uint8_t cts)
 {
 	/* set UMA_CODE */
@@ -369,16 +363,6 @@ static int flash_program_bytes(uint32_t offset, uint32_t bytes,
 	return rv;
 }
 
-static int flash_spi_sel_lock(int enable)
-{
-	/*
-	 * F_SPI_QUAD, F_SPI_CS1_1/2, F_SPI_TRIS become read-only
-	 * if this bit is set
-	 */
-	UPDATE_BIT(NPCX_DEV_CTL4, NPCX_DEV_CTL4_F_SPI_SLLK, enable);
-	return IS_BIT_SET(NPCX_DEV_CTL4, NPCX_DEV_CTL4_F_SPI_SLLK);
-}
-
 /*****************************************************************************/
 
 int flash_physical_read(int offset, int size, char *data)
@@ -672,6 +656,23 @@ DECLARE_HOST_COMMAND(EC_CMD_FLASH_SPI_INFO,
 
 #endif
 
+#ifdef CONFIG_CMD_FLASH_TRISTATE
+static void flash_tristate(int enable)
+{
+	/* Enable/Disable FIU pins to tri-state */
+	UPDATE_BIT(NPCX_DEVCNT, NPCX_DEVCNT_F_SPI_TRIS, enable);
+}
+
+static int flash_spi_sel_lock(int enable)
+{
+	/*
+	 * F_SPI_QUAD, F_SPI_CS1_1/2, F_SPI_TRIS become read-only
+	 * if this bit is set
+	 */
+	UPDATE_BIT(NPCX_DEV_CTL4, NPCX_DEV_CTL4_F_SPI_SLLK, enable);
+	return IS_BIT_SET(NPCX_DEV_CTL4, NPCX_DEV_CTL4_F_SPI_SLLK);
+}
+
 /*****************************************************************************/
 /* Console commands */
 
@@ -707,4 +708,4 @@ static int command_flash_tristate(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(flash_tristate, command_flash_tristate,
 			"[0 | 1]",
 			"Tristate spi flash pins");
-
+#endif /* CONFIG_CMD_FLASH_TRISTATE */
diff --git a/common/switch.c b/common/switch.c
index ab5c971ff7..1ca490a6b4 100644
--- a/common/switch.c
+++ b/common/switch.c
@@ -101,6 +101,7 @@ void switch_interrupt(enum gpio_signal signal)
 	hook_call_deferred(&switch_update_data, 0);
 }
 
+#ifdef CONFIG_CMD_MMAPINFO
 static int command_mmapinfo(int argc, char **argv)
 {
 	uint8_t *memmap_switches = host_get_memmap(EC_MEMMAP_SWITCHES);
@@ -124,4 +125,4 @@ static int command_mmapinfo(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(mmapinfo, command_mmapinfo,
 			NULL,
 			"Print memmap switch state");
-
+#endif
diff --git a/include/config.h b/include/config.h
index 69cd34815e..d13757f222 100644
--- a/include/config.h
+++ b/include/config.h
@@ -637,6 +637,7 @@
 #undef  CONFIG_CMD_ECTEMP
 #define CONFIG_CMD_FASTCHARGE
 #undef  CONFIG_CMD_FLASH
+#undef  CONFIG_CMD_FLASH_TRISTATE
 #undef  CONFIG_CMD_FORCETIME
 #undef  CONFIG_CMD_GPIO_EXTENDED
 #undef  CONFIG_CMD_GSV
@@ -662,6 +663,7 @@
 #undef  CONFIG_CMD_MCDP
 #define CONFIG_CMD_MD
 #define CONFIG_CMD_MEM
+#define CONFIG_CMD_MMAPINFO
 #define CONFIG_CMD_PD
 #undef  CONFIG_CMD_PD_CONTROL
 #undef  CONFIG_CMD_PD_DEV_DUMP_INFO