voema: delete voema_npcx796

Delete the deprecated variant voema_npcx796

BUG=b:205166645
BRANCH=volteer
TEST=make buildall

Cq-Include-Trybots: luci.chromeos.cq:cq-orchestrator
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I6c84a34ac8f0e6746d3a6526f5ef6f6c7caf218e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3280020
Reviewed-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Commit-Queue: Abe Levkoy <alevkoy@chromium.org>

5 files changed, 1 insertions, 27 deletions

diff --git a/board/voema/board.h b/board/voema/board.h
index 3ea08ac6ed..2f1326ee7a 100644
--- a/board/voema/board.h
+++ b/board/voema/board.h
@@ -11,16 +11,11 @@
 /* Baseboard features */
 #include "baseboard.h"
 
-#ifdef BOARD_VOEMA
 /*
  * The RAM and flash size combination on the the NPCX797FC does not leave
  * any unused flash space that can be used to store the .init_rom section.
  */
 #undef CONFIG_CHIP_INIT_ROM_REGION
-#else
-/* Free up flash space */
-#undef CONFIG_CONSOLE_CMDHELP
-#endif /* BOARD_VOEMA */
 
 #define CONFIG_VBOOT_EFS2
 
@@ -56,12 +51,7 @@
 	TASK_EVENT_MOTION_SENSOR_INTERRUPT(CLEAR_ALS)
 
 /* Sensors without hardware FIFO are in forced mode */
-#ifdef BOARD_VOEMA_NPCX796FC
-#define CONFIG_ACCEL_FORCE_MODE_MASK \
-	(BIT(LID_ACCEL) | BIT(CLEAR_ALS) | BIT(BASE_ACCEL))
-#else
 #define CONFIG_ACCEL_FORCE_MODE_MASK (board_accel_force_mode_mask())
-#endif
 
 #define CONFIG_LID_ANGLE
 #define CONFIG_LID_ANGLE_UPDATE
@@ -193,10 +183,8 @@ enum usbc_port {
 };
 
 void board_reset_pd_mcu(void);
-#ifndef BOARD_VOEMA_NPCX796FC
 void motion_interrupt(enum gpio_signal signal);
 int board_accel_force_mode_mask(void);
-#endif
 
 #endif /* !__ASSEMBLER__ */
 
diff --git a/board/voema/build.mk b/board/voema/build.mk
index 0a0929babc..d7d771ebab 100644
--- a/board/voema/build.mk
+++ b/board/voema/build.mk
@@ -8,13 +8,7 @@
 
 CHIP:=npcx
 CHIP_FAMILY:=npcx7
-# Limited boards with 796 variant and will use 797 moving forward. Set the
-# modify the variant type to match.
-ifeq ($(BOARD),voema_npcx796fc)
-CHIP_VARIANT:=npcx7m6fc
-else
 CHIP_VARIANT:=npcx7m7fc
-endif
 
 BASEBOARD:=volteer
 
diff --git a/board/voema/gpio.inc b/board/voema/gpio.inc
index 4273fb8974..7506ccdbd1 100644
--- a/board/voema/gpio.inc
+++ b/board/voema/gpio.inc
@@ -26,11 +26,7 @@ GPIO_INT(PG_EC_ALL_SYS_PWRGD,  PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt)
 
 /* Sensor Interrupts */
 GPIO_INT(EC_ALS_RGB_INT_L,     PIN(D, 4), GPIO_INT_FALLING, tcs3400_interrupt)
-#ifndef BOARD_VOEMA_NPCX796FC
 GPIO_INT(EC_MB_ACCEL_INT_L,    PIN(5, 6), GPIO_INT_FALLING | GPIO_SEL_1P8V, motion_interrupt)
-#else
-GPIO(EC_MB_ACCEL_INT_L,	       PIN(5, 6), GPIO_INPUT | GPIO_PULL_UP)
-#endif
 GPIO_INT(TABLET_MODE_L,        PIN(9, 5), GPIO_INT_BOTH, gmr_tablet_switch_isr)
 
 /*
diff --git a/board/voema/sensors.c b/board/voema/sensors.c
index 005bad5af8..071dc5247b 100644
--- a/board/voema/sensors.c
+++ b/board/voema/sensors.c
@@ -286,8 +286,7 @@ static void baseboard_sensors_init(void)
 	 * TODO: If a SSFC for the base sensor is added, add the check
 	 * here.
 	 */
-	if (IS_ENABLED(BOARD_VOEMA) && get_cbi_ssfc_base_sensor() ==
-			SSFC_SENSOR_BASE_ICM426XX) {
+	if (get_cbi_ssfc_base_sensor() == SSFC_SENSOR_BASE_ICM426XX) {
 		gpio_enable_interrupt(GPIO_EC_MB_ACCEL_INT_L);
 		motion_sensors[BASE_ACCEL] = icm_base_accel;
 		motion_sensors[BASE_GYRO] = icm_base_gyro;
@@ -303,7 +302,6 @@ static void baseboard_sensors_init(void)
 }
 DECLARE_HOOK(HOOK_INIT, baseboard_sensors_init, HOOK_PRIO_DEFAULT);
 
-#ifndef BOARD_VOEMA_NPCX796FC
 void motion_interrupt(enum gpio_signal signal)
 {
 	icm426xx_interrupt(signal);
@@ -316,4 +314,3 @@ int board_accel_force_mode_mask(void)
 	else
 		return (BIT(LID_ACCEL) | BIT(CLEAR_ALS));
 }
-#endif
diff --git a/board/voema_npcx796fc b/board/voema_npcx796fc
deleted file mode 120000
index 172bf9e9be..0000000000
--- a/board/voema_npcx796fc
+++ /dev/null
@@ -1 +0,0 @@
-voema
\ No newline at end of file