ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

11 files changed, 0 insertions, 1159 deletions

diff --git a/zephyr/projects/trogdor/lazor/CMakeLists.txt b/zephyr/projects/trogdor/lazor/CMakeLists.txt
deleted file mode 100644
index 7ab5d6a92e..0000000000
--- a/zephyr/projects/trogdor/lazor/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-cmake_minimum_required(VERSION 3.13.1)
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(lazor)
-
-zephyr_library_include_directories(include)
-
-set(PLATFORM_EC_BASEBOARD "${PLATFORM_EC}/baseboard/trogdor" CACHE PATH
-    "Path to the platform/ec baseboard directory")
-set(PLATFORM_EC_BOARD "${PLATFORM_EC}/board/lazor" CACHE PATH
-  "Path to the platform/ec board directory")
-
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
-  "${PLATFORM_EC_BASEBOARD}/hibernate.c"
-  "${PLATFORM_EC_BASEBOARD}/power.c"
-  "${PLATFORM_EC_BASEBOARD}/usbc_config.c"
-  "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c")
-
-zephyr_library_sources(
-  "${PLATFORM_EC_BOARD}/hibernate.c"
-  "${PLATFORM_EC_BOARD}/sku.c"
-  "${PLATFORM_EC_BOARD}/switchcap.c"
-  "${PLATFORM_EC_BOARD}/usbc_config.c")
-
-# Board specific implementation
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C
-  "src/i2c.c")
-
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
-  "src/led.c")
diff --git a/zephyr/projects/trogdor/lazor/battery.dts b/zephyr/projects/trogdor/lazor/battery.dts
deleted file mode 100644
index 52aa69d400..0000000000
--- a/zephyr/projects/trogdor/lazor/battery.dts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/ {
-	batteries {
-		default_battery: ap16l5j {
-			compatible = "panasonic,ap16l5j";
-		};
-		ap16l5j_009 {
-			compatible = "panasonic,ap16l5j-009";
-		};
-		ap16l8j {
-			compatible = "lgc,ap16l8j";
-		};
-		lgc_ap18c8k {
-			compatible = "lgc,ap18c8k";
-		};
-		murata_ap18c4k {
-			compatible = "murata,ap18c4k";
-		};
-	};
-};
diff --git a/zephyr/projects/trogdor/lazor/gpio.dts b/zephyr/projects/trogdor/lazor/gpio.dts
deleted file mode 100644
index 282ea97bb4..0000000000
--- a/zephyr/projects/trogdor/lazor/gpio.dts
+++ /dev/null
@@ -1,446 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/ {
-	named-gpios {
-		compatible = "named-gpios";
-
-		usb_c0_pd_int_odl {
-			gpios = <&gpioe 0 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_PD_INT_ODL";
-			label = "USB_C0_PD_INT_ODL";
-		};
-		usb_c1_pd_int_odl {
-			gpios = <&gpiof 5 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_PD_INT_ODL";
-			label = "USB_C1_PD_INT_ODL";
-		};
-		usb_c0_swctl_int_odl {
-			gpios = <&gpio0 3 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C0_SWCTL_INT_ODL";
-			label = "USB_C0_SWCTL_INT_ODL";
-		};
-		usb_c1_swctl_int_odl {
-			gpios = <&gpio4 0 GPIO_INPUT>;
-			enum-name = "GPIO_USB_C1_SWCTL_INT_ODL";
-			label = "USB_C1_SWCTL_INT_ODL";
-		};
-		usb_c0_bc12_int_l {
-			gpios = <&gpio6 1 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_USB_C0_BC12_INT_L";
-			label = "USB_C0_BC12_INT_L";
-		};
-		usb_c1_bc12_int_l {
-			gpios = <&gpio8 2 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_USB_C1_BC12_INT_L";
-			label = "USB_C1_BC12_INT_L";
-		};
-		usb_a0_oc_odl {
-			gpios = <&gpiod 1 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_USB_A0_OC_ODL";
-			label = "USB_A0_OC_ODL";
-		};
-		gpio_acok_od: acok_od {
-			gpios = <&gpio0 0 GPIO_INPUT>;
-			enum-name = "GPIO_AC_PRESENT";
-			label = "ACOK_OD";
-		};
-		ccd_mode_odl {
-			gpios = <&gpioe 3 GPIO_INPUT>;
-			enum-name = "GPIO_CCD_MODE_ODL";
-			label = "CCD_MODE_ODL";
-		};
-		gpio_ec_pwr_btn_odl: ec_pwr_btn_odl {
-			gpios = <&gpio0 1 GPIO_INPUT>;
-			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "EC_PWR_BTN_ODL";
-		};
-		ec_voldn_btn_odl {
-			gpios = <&gpio7 0 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_VOLUME_DOWN_L";
-			label = "EC_VOLDN_BTN_ODL";
-		};
-		ec_volup_btn_odl {
-			gpios = <&gpiof 2 (GPIO_INPUT | GPIO_PULL_UP)>;
-			enum-name = "GPIO_VOLUME_UP_L";
-			label = "EC_VOLUP_BTN_ODL";
-		};
-		ec_wp_odl {
-			gpios = <&gpioa 1 GPIO_INPUT>;
-			enum-name = "GPIO_WP_L";
-			label = "EC_WP_ODL";
-		};
-		gpio_lid_open_ec: lid_open_ec {
-			gpios = <&gpiod 2 GPIO_INPUT>;
-			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN_EC";
-		};
-		ap_rst_l {
-			gpios = <&gpioc 1 GPIO_INPUT>;
-			enum-name = "GPIO_AP_RST_L";
-			label = "AP_RST_L";
-		};
-		ps_hold {
-			gpios = <&gpioa 4 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			enum-name = "GPIO_PS_HOLD";
-			label = "PS_HOLD";
-		};
-		ap_suspend {
-			gpios = <&gpio5 7 GPIO_INPUT>;
-			enum-name = "GPIO_AP_SUSPEND";
-			label = "AP_SUSPEND";
-		};
-		deprecated_ap_rst_req {
-			gpios = <&gpioc 2 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			enum-name = "GPIO_DEPRECATED_AP_RST_REQ";
-			label = "DEPRECATED_AP_RST_REQ";
-		};
-		power_good {
-			gpios = <&gpio5 4 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			enum-name = "GPIO_POWER_GOOD";
-			label = "POWER_GOOD";
-		};
-		warm_reset_l {
-			gpios = <&gpiof 4 GPIO_INPUT>;
-			enum-name = "GPIO_WARM_RESET_L";
-			label = "WARM_RESET_L";
-		};
-		ap_ec_spi_cs_l {
-			gpios = <&gpio5 3 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CS_L";
-		};
-		tablet_mode_l {
-			gpios = <&gpioc 6 GPIO_INPUT>;
-			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
-		};
-		gpio_accel_gyro_int_l: accel_gyro_int_l {
-			gpios = <&gpioa 0 GPIO_INPUT>;
-			enum-name = "GPIO_ACCEL_GYRO_INT_L";
-			label = "ACCEL_GYRO_INT_L";
-		};
-		da9313_gpio0 {
-			gpios = <&gpioe 2 GPIO_INPUT>;
-			enum-name = "GPIO_DA9313_GPIO0";
-			label = "DA9313_GPIO0";
-		};
-		switchcap_pg_int_l {
-			gpios = <&gpioe 2 GPIO_INPUT>;
-			enum-name = "GPIO_SWITCHCAP_PG_INT_L";
-			label = "SWITCHCAP_PG_INT_L";
-		};
-		gpio_ec_rst_odl: ec_rst_odl {
-			gpios = <&gpio0 2 GPIO_INPUT>;
-			enum-name = "GPIO_EC_RST_ODL";
-			label = "EC_RST_ODL";
-		};
-		ec_entering_rw {
-			gpios = <&gpioe 1 GPIO_OUT_LOW>;
-			enum-name = "GPIO_ENTERING_RW";
-			label = "EC_ENTERING_RW";
-		};
-		ec_batt_pres_odl {
-			gpios = <&gpioe 5 GPIO_INPUT>;
-			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "EC_BATT_PRES_ODL";
-		};
-		pm845_resin_l {
-			gpios = <&gpio3 2 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_PMIC_RESIN_L";
-			label = "PM845_RESIN_L";
-		};
-		pmic_kpd_pwr_odl {
-			gpios = <&gpiod 6 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_PMIC_KPD_PWR_ODL";
-			label = "PMIC_KPD_PWR_ODL";
-		};
-		ec_int_l {
-			gpios = <&gpioa 2 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_EC_INT_L";
-			label = "EC_INT_L";
-		};
-		qsip_on {
-			gpios = <&gpio5 0 GPIO_OUT_LOW>;
-			enum-name = "GPIO_QSIP_ON";
-			label = "QSIP_ON";
-		};
-		hibernate_l {
-			gpios = <&gpio5 2 GPIO_OUT_HIGH>;
-			enum-name = "GPIO_HIBERNATE_L";
-			label = "HIBERNATE_L";
-		};
-		switchcap_on {
-			gpios = <&gpiod 5 GPIO_OUT_LOW>;
-			enum-name = "GPIO_SWITCHCAP_ON";
-			label = "SWITCHCAP_ON";
-		};
-		switchcap_on_l {
-			gpios = <&gpiod 5 GPIO_OUT_LOW>;
-			enum-name = "GPIO_SWITCHCAP_ON_L";
-			label = "SWITCHCAP_ON_L";
-		};
-		vbob_en {
-			gpios = <&gpiod 3 GPIO_OUT_LOW>;
-			enum-name = "GPIO_VBOB_EN";
-			label = "VBOB_EN";
-		};
-		en_pp3300_a {
-			gpios = <&gpioa 6 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_PP3300_A";
-			label = "EN_PP3300_A";
-		};
-		en_pp5000_a {
-			gpios = <&gpio6 7 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_PP5000";
-			label = "EN_PP5000_A";
-		};
-		ec_bl_disable_l {
-			gpios = <&gpiob 6 GPIO_OUT_LOW>;
-			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_BL_DISABLE_L";
-		};
-		lid_accel_int_l {
-			gpios = <&gpio5 6 GPIO_INPUT>;
-			enum-name = "GPIO_LID_ACCEL_INT_L";
-			label = "LID_ACCEL_INT_L";
-		};
-		trackpad_int_gate {
-			gpios = <&gpio7 4 GPIO_OUT_LOW>;
-			enum-name = "GPIO_TRACKPAD_INT_GATE";
-			label = "TRACKPAD_INT_GATE";
-		};
-		usb_c0_pd_rst_l {
-			gpios = <&gpiof 1 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_USB_C0_PD_RST_L";
-			label = "USB_C0_PD_RST_L";
-		};
-		usb_c1_pd_rst_l {
-			gpios = <&gpioe 4 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_USB_C1_PD_RST_L";
-			label = "USB_C1_PD_RST_L";
-		};
-		dp_mux_oe_l {
-			gpios = <&gpio9 6 GPIO_ODR_HIGH>;
-			enum-name = "GPIO_DP_MUX_OE_L";
-			label = "DP_MUX_OE_L";
-		};
-		dp_mux_sel {
-			gpios = <&gpio4 5 GPIO_OUT_LOW>;
-			enum-name = "GPIO_DP_MUX_SEL";
-			label = "DP_MUX_SEL";
-		};
-		dp_hot_plug_det {
-			gpios = <&gpio9 5 GPIO_OUT_LOW>;
-			enum-name = "GPIO_DP_HOT_PLUG_DET";
-			label = "DP_HOT_PLUG_DET";
-		};
-		en_usb_a_5v {
-			gpios = <&gpio8 6 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EN_USB_A_5V";
-			label = "EN_USB_A_5V";
-		};
-		usb_a_cdp_ilim_en {
-			gpios = <&gpio7 5 GPIO_OUT_HIGH>;
-			label = "USB_A_CDP_ILIM_EN";
-		};
-		ec_chg_led_y_c1 {
-			gpios = <&gpioc 3 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EC_CHG_LED_Y_C1";
-			label = "EC_CHG_LED_Y_C1";
-		};
-		ec_chg_led_b_c1 {
-			gpios = <&gpioc 4 GPIO_OUT_LOW>;
-			enum-name = "GPIO_EC_CHG_LED_B_C1";
-			label = "EC_CHG_LED_B_C1";
-		};
-		ap_ec_spi_mosi {
-			gpios = <&gpio4 6 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MOSI";
-		};
-		ap_ec_spi_miso {
-			gpios = <&gpio4 7 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MISO";
-		};
-		ap_ec_spi_clk {
-			gpios = <&gpio5 5 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CLK";
-		};
-		kb_bl_pwm {
-			gpios = <&gpio8 0 GPIO_INPUT>;
-			label = "KB_BL_PWM";
-		};
-		edp_bkltctl {
-			gpios = <&gpiob 7 GPIO_INPUT>;
-			label = "EDP_BKLTCTL";
-		};
-		ppvar_boostin_sense {
-			gpios = <&gpio4 4 GPIO_INPUT>;
-			label = "PPVAR_BOOSTIN_SENSE";
-		};
-		charger_iadp {
-			gpios = <&gpio4 3 GPIO_INPUT>;
-			label = "CHARGER_IADP";
-		};
-		charger_pmon {
-			gpios = <&gpio4 2 GPIO_INPUT>;
-			label = "CHARGER_PMON";
-		};
-		ec_i2c_power_scl {
-			gpios = <&gpiob 5 GPIO_INPUT>;
-			label = "EC_I2C_POWER_SCL";
-		};
-		ec_i2c_power_sda {
-			gpios = <&gpiob 4 GPIO_INPUT>;
-			label = "EC_I2C_POWER_SDA";
-		};
-		ec_i2c_usb_c0_pd_scl {
-			gpios = <&gpio9 0 GPIO_INPUT>;
-			label = "EC_I2C_USB_C0_PD_SCL";
-		};
-		ec_i2c_usb_c0_pd_sda {
-			gpios = <&gpio8 7 GPIO_INPUT>;
-			label = "EC_I2C_USB_C0_PD_SDA";
-		};
-		ec_i2c_usb_c1_pd_scl {
-			gpios = <&gpio9 2 GPIO_INPUT>;
-			label = "EC_I2C_USB_C1_PD_SCL";
-		};
-		ec_i2c_usb_c1_pd_sda {
-			gpios = <&gpio9 1 GPIO_INPUT>;
-			label = "EC_I2C_USB_C1_PD_SDA";
-		};
-		ec_i2c_eeprom_scl {
-			gpios = <&gpio3 3 GPIO_INPUT>;
-			label = "EC_I2C_EEPROM_SCL";
-		};
-		ec_i2c_eeprom_sda {
-			gpios = <&gpio3 6 GPIO_INPUT>;
-			label = "EC_I2C_EEPROM_SDA";
-		};
-		ec_i2c_sensor_scl {
-			gpios = <&gpiob 3 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C_SENSOR_SCL";
-			label = "EC_I2C_SENSOR_SCL";
-		};
-		ec_i2c_sensor_sda {
-			gpios = <&gpiob 2 GPIO_INPUT>;
-			enum-name = "GPIO_EC_I2C_SENSOR_SDA";
-			label = "EC_I2C_SENSOR_SDA";
-		};
-		gpio_brd_id0: brd_id0 {
-			gpios = <&gpioc 7 GPIO_INPUT>;
-			enum-name = "GPIO_BOARD_VERSION1";
-			label = "BRD_ID0";
-		};
-		gpio_brd_id1: brd_id1 {
-			gpios = <&gpio9 3 GPIO_INPUT>;
-			enum-name = "GPIO_BOARD_VERSION2";
-			label = "BRD_ID1";
-		};
-		gpio_brd_id2: brd_id2 {
-			gpios = <&gpio6 3 GPIO_INPUT>;
-			enum-name = "GPIO_BOARD_VERSION3";
-			label = "BRD_ID2";
-		};
-		gpio_sku_id0: sku_id0 {
-			gpios = <&gpiof 0 GPIO_INPUT>;
-			enum-name = "GPIO_SKU_ID0";
-			label = "SKU_ID0";
-		};
-		gpio_sku_id1: sku_id1 {
-			gpios = <&gpio4 1 GPIO_INPUT>;
-			enum-name = "GPIO_SKU_ID1";
-			label = "SKU_ID1";
-		};
-		gpio_sku_id2: sku_id2 {
-			gpios = <&gpiod 4 GPIO_INPUT>;
-			enum-name = "GPIO_SKU_ID2";
-			label = "SKU_ID2";
-		};
-		arm_x86 {
-			gpios = <&gpio6 6 GPIO_OUT_LOW>;
-			label = "ARM_X86";
-		};
-		ec_kso_02_inv {
-			gpios = <&gpio1 7 GPIO_OUT_LOW>;
-			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
-		};
-	};
-
-	def-lvol-io-list {
-		compatible = "nuvoton,npcx-lvolctrl-def";
-		lvol-io-pads = <
-			&lvol_ioc1 /* AP_RST_L */
-			&lvol_ioc2 /* DEPRECATED_AP_RST_REQ */
-			&lvol_iof4 /* WARM_RESET_L */
-			&lvol_iob3 /* EC_I2C_SENSOR_SCL */
-			&lvol_iob2 /* EC_I2C_SENSOR_SDA */
-		>;
-	};
-
-	hibernate-wake-pins {
-		compatible = "cros-ec,hibernate-wake-pins";
-		wakeup-pins = <
-			&gpio_acok_od
-			&gpio_ec_pwr_btn_odl
-			&gpio_lid_open_ec
-			&gpio_ec_rst_odl
-		>;
-	};
-
-	sku {
-		compatible = "cros-ec,gpio-id";
-
-		bits  = <
-			&gpio_sku_id0
-			&gpio_sku_id1
-			&gpio_sku_id2
-		>;
-
-		system = "binary";
-	};
-
-	board {
-		compatible = "cros-ec,gpio-id";
-
-		bits  = <
-			&gpio_brd_id0
-			&gpio_brd_id1
-			&gpio_brd_id2
-		>;
-
-		system = "binary_first_base3";
-	};
-
-	unused-pins {
-		compatible = "unused-gpios";
-		unused-gpios =
-			<&gpio5 1 0>,
-			<&gpiod 0 0>,
-			<&gpiof 3 0>,
-			<&gpio0 4 0>,
-			<&gpioc 0 0>,
-			<&gpioa 7 0>,
-			<&gpio8 3 0>,
-			<&gpio8 1 0>,
-			<&gpio3 7 0>,
-			<&gpio7 6 0>,
-			<&gpio3 4 0>,
-			<&gpioc 5 0>,
-			<&gpioa 3 0>,
-			<&gpio7 3 0>,
-			<&gpiod 7 0>,
-			<&gpioa 5 0>,
-			<&gpiob 0 0>,
-			<&gpio9 4 0>,
-			<&gpiob 1 0>,
-			<&gpio6 2 0>,
-			<&gpio3 5 0>,
-			<&gpio9 7 0>,
-			<&gpio6 0 0>,
-			<&gpio7 2 0>;
-	};
-};
diff --git a/zephyr/projects/trogdor/lazor/include/gpio_map.h b/zephyr/projects/trogdor/lazor/include/gpio_map.h
deleted file mode 100644
index 00ee9c48e1..0000000000
--- a/zephyr/projects/trogdor/lazor/include/gpio_map.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_GPIO_MAP_H
-#define __ZEPHYR_GPIO_MAP_H
-
-#include <devicetree.h>
-#include <gpio_signal.h>
-
-#ifdef CONFIG_PLATFORM_EC_GMR_TABLET_MODE
-#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE_L
-#endif
-
-/*
- * Set EC_CROS_GPIO_INTERRUPTS to a space-separated list of GPIO_INT items.
- *
- * Each GPIO_INT requires three parameters:
- *   gpio_signal - The enum gpio_signal for the interrupt gpio
- *   interrupt_flags - The interrupt-related flags (e.g. GPIO_INT_EDGE_BOTH)
- *   handler - The platform/ec interrupt handler.
- *
- * Ensure that this files includes all necessary headers to declare all
- * referenced handler functions.
- *
- * For example, one could use the follow definition:
- * #define EC_CROS_GPIO_INTERRUPTS \
- *   GPIO_INT(NAMED_GPIO(h1_ec_pwr_btn_odl), GPIO_INT_EDGE_BOTH, button_print)
- */
-#define EC_CROS_GPIO_INTERRUPTS                                               \
-	GPIO_INT(GPIO_AC_PRESENT, GPIO_INT_EDGE_BOTH, extpower_interrupt)     \
-	GPIO_INT(GPIO_LID_OPEN, GPIO_INT_EDGE_BOTH, lid_interrupt)            \
-	GPIO_INT(GPIO_WP_L, GPIO_INT_EDGE_BOTH, switch_interrupt)             \
-	GPIO_INT(GPIO_POWER_BUTTON_L, GPIO_INT_EDGE_BOTH,                     \
-		 power_button_interrupt)                                      \
-	GPIO_INT(GPIO_VOLUME_DOWN_L, GPIO_INT_EDGE_BOTH, button_interrupt)    \
-	GPIO_INT(GPIO_VOLUME_UP_L, GPIO_INT_EDGE_BOTH, button_interrupt)      \
-	GPIO_INT(GPIO_SWITCHCAP_PG_INT_L, GPIO_INT_EDGE_FALLING,              \
-		 ln9310_interrupt)                                            \
-	GPIO_INT(GPIO_AP_RST_L, GPIO_INT_EDGE_BOTH, chipset_ap_rst_interrupt) \
-	GPIO_INT(GPIO_AP_SUSPEND, GPIO_INT_EDGE_BOTH, power_signal_interrupt) \
-	GPIO_INT(GPIO_DEPRECATED_AP_RST_REQ, GPIO_INT_EDGE_BOTH,              \
-		 power_signal_interrupt)                                      \
-	GPIO_INT(GPIO_POWER_GOOD, GPIO_INT_EDGE_BOTH,                         \
-		 chipset_power_good_interrupt)                                \
-	GPIO_INT(GPIO_PS_HOLD, GPIO_INT_EDGE_BOTH, power_signal_interrupt)    \
-	GPIO_INT(GPIO_WARM_RESET_L, GPIO_INT_EDGE_BOTH,                       \
-		 chipset_warm_reset_interrupt)                                \
-	GPIO_INT(GPIO_USB_C0_PD_INT_ODL, GPIO_INT_EDGE_FALLING,               \
-		 tcpc_alert_event)                                            \
-	GPIO_INT(GPIO_USB_C1_PD_INT_ODL, GPIO_INT_EDGE_FALLING,               \
-		 tcpc_alert_event)                                            \
-	GPIO_INT(GPIO_USB_C0_SWCTL_INT_ODL, GPIO_INT_EDGE_FALLING,            \
-		 ppc_interrupt)                                               \
-	GPIO_INT(GPIO_USB_C1_SWCTL_INT_ODL, GPIO_INT_EDGE_FALLING,            \
-		 ppc_interrupt)                                               \
-	GPIO_INT(GPIO_USB_C0_BC12_INT_L, GPIO_INT_EDGE_FALLING, usb0_evt)     \
-	GPIO_INT(GPIO_USB_C1_BC12_INT_L, GPIO_INT_EDGE_FALLING, usb1_evt)     \
-	GPIO_INT(GPIO_USB_A0_OC_ODL, GPIO_INT_EDGE_BOTH, usba_oc_interrupt)   \
-	GPIO_INT(GPIO_CCD_MODE_ODL, GPIO_INT_EDGE_FALLING,                    \
-		 board_connect_c0_sbu)                                        \
-	GPIO_INT(GPIO_ACCEL_GYRO_INT_L, GPIO_INT_EDGE_FALLING,                \
-		 bmi160_interrupt)                                            \
-	GPIO_INT(GPIO_TABLET_MODE_L, GPIO_INT_EDGE_BOTH, gmr_tablet_switch_isr)
-
-#endif /* __ZEPHYR_GPIO_MAP_H */
diff --git a/zephyr/projects/trogdor/lazor/include/pwm_map.h b/zephyr/projects/trogdor/lazor/include/pwm_map.h
deleted file mode 100644
index e704b6d6d3..0000000000
--- a/zephyr/projects/trogdor/lazor/include/pwm_map.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __ZEPHYR_PWM_MAP_H
-#define __ZEPHYR_PWM_MAP_H
-
-#include <devicetree.h>
-
-#include "pwm/pwm.h"
-
-#define PWM_CH_KBLIGHT		NAMED_PWM(kblight)
-#define PWM_CH_DISPLIGHT	NAMED_PWM(displight)
-
-#endif /* __ZEPHYR_PWM_MAP_H */
diff --git a/zephyr/projects/trogdor/lazor/keyboard.dts b/zephyr/projects/trogdor/lazor/keyboard.dts
deleted file mode 100644
index 1b683d0eba..0000000000
--- a/zephyr/projects/trogdor/lazor/keyboard.dts
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/ {
-	cros-keyscan {
-		compatible = "cros-keyscan";
-
-		actual-key-mask = <
-			0x14	/* C0 */
-			0xff	/* C1 */
-			0xff	/* C2 */
-			0xff	/* C3 */
-			0xff	/* C4 */
-			0xf5	/* C5 */
-			0xff	/* C6 */
-			0xa4	/* C7 */
-			0xff	/* C8 */
-			0xfe	/* C9 */
-			0x55	/* C10 */
-			0xfa	/* C11 */
-			0xca	/* C12 */
-			>;
-	};
-};
diff --git a/zephyr/projects/trogdor/lazor/motionsense.dts b/zephyr/projects/trogdor/lazor/motionsense.dts
deleted file mode 100644
index 51d8505078..0000000000
--- a/zephyr/projects/trogdor/lazor/motionsense.dts
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Copyright 2020 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <dt-bindings/motionsense/utils.h>
-
-
-/ {
-	aliases {
-		/*
-		 * motion sense's <>_INT_EVENT is handled
-		 * by alias. Using the alias, each driver creates
-		 * its own <>_INT_EVENT.
-		 */
-		bmi160-int = &base_accel;
-	};
-
-	/*
-	 * Declare mutexes used by sensor drivers.
-	 * A mutex node is used to create an instance of mutex_t.
-	 * A mutex node is referenced by a sensor node if the
-	 * corresponding sensor driver needs to use the
-	 * instance of the mutex.
-	 */
-	motionsense-mutex {
-		compatible = "cros-ec,motionsense-mutex";
-		lid_mutex: lid-mutex {
-			label = "LID_MUTEX";
-		};
-
-		mutex_bmi160: bmi160-mutex {
-			label = "BMI160_MUTEX";
-		};
-	};
-
-	/* Rotation matrix used by drivers. */
-	motionsense-rotation-ref {
-		compatible = "cros-ec,motionsense-rotation-ref";
-		lid_rot_ref: lid-rotation-ref {
-			mat33 = <(-1) 0 0
-				 0 (-1) 0
-				 0 0 1>;
-		};
-
-		base_rot_ref: base-rotation-ref {
-			mat33 = <1 0 0
-				 0 (-1) 0
-				 0 0 (-1)>;
-		};
-	};
-
-	/*
-	 * Driver specific data. A driver-specific data can be shared with
-	 * different motion sensors while they are using the same driver.
-	 *
-	 * If a node's compatible starts with "cros-ec,accelgyro-", it is for
-	 * a common structure defined in accelgyro.h.
-	 * e.g) compatible = "cros-ec,accelgyro-als-drv-data" is for
-	 * "struct als_drv_data_t" in accelgyro.h
-	 */
-	motionsense-sensor-data {
-		bma255_data: bma255-drv-data {
-			compatible = "cros-ec,drvdata-bma255";
-			status = "okay";
-		};
-
-		bmi160_data: bmi160-drv-data {
-			compatible = "cros-ec,drvdata-bmi160";
-			status = "okay";
-		};
-
-		kx022_data: kx022-drv-data {
-			compatible = "cros-ec,drvdata-kionix";
-			status = "okay";
-		};
-	};
-
-	/*
-	 * List of motion sensors that creates motion_sensors array.
-	 * The label "lid_accel" and "base_accel" are used to indicate
-	 * motion sensor IDs for lid angle calculation.
-	 */
-	motionsense-sensor {
-		lid_accel: lid-accel {
-			compatible = "cros-ec,bma255";
-			status = "okay";
-
-			label = "Lid Accel";
-			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
-			location = "MOTIONSENSE_LOC_LID";
-			mutex = <&lid_mutex>;
-			port = <&i2c_sensor>;
-			rot-standard-ref = <&lid_rot_ref>;
-			default-range = <2>;
-			drv-data = <&bma255_data>;
-			i2c-spi-addr-flags = "BMA2x2_I2C_ADDR1_FLAGS";
-			configs {
-				compatible =
-					"cros-ec,motionsense-sensor-config";
-				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-				};
-				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-				};
-			};
-		};
-
-		base_accel: base-accel {
-			compatible = "cros-ec,bmi160-accel";
-			status = "okay";
-
-			label = "Base Accel";
-			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
-			location = "MOTIONSENSE_LOC_BASE";
-			mutex = <&mutex_bmi160>;
-			port = <&i2c_sensor>;
-			rot-standard-ref = <&base_rot_ref>;
-			drv-data = <&bmi160_data>;
-			configs {
-				compatible =
-					"cros-ec,motionsense-sensor-config";
-				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-				};
-				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-				};
-			};
-		};
-
-		base-gyro {
-			compatible = "cros-ec,bmi160-gyro";
-			status = "okay";
-
-			label = "Base Gyro";
-			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
-			location = "MOTIONSENSE_LOC_BASE";
-			mutex = <&mutex_bmi160>;
-			port = <&i2c_sensor>;
-			rot-standard-ref = <&base_rot_ref>;
-			drv-data = <&bmi160_data>;
-		};
-	};
-
-	/*
-	 * List of alternative motion sensors that creates
-	 * motion_sensors_alt array.
-	 */
-	motionsense-sensor-alt {
-		alt_lid_accel {
-			compatible = "cros-ec,kx022";
-			status = "okay";
-			label = "Lid Accel";
-			active-mask = "SENSOR_ACTIVE_S0_S3_S5";
-			location = "MOTIONSENSE_LOC_LID";
-			mutex = <&lid_mutex>;
-			port = <&i2c_sensor>;
-			rot-standard-ref = <&lid_rot_ref>;
-			drv-data = <&kx022_data>;
-			alternate-for = <&lid_accel>;
-			configs {
-				compatible =
-					"cros-ec,motionsense-sensor-config";
-				ec-s0 {
-					label = "SENSOR_CONFIG_EC_S0";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-				};
-				ec-s3 {
-					label = "SENSOR_CONFIG_EC_S3";
-					odr = <(10000 | ROUND_UP_FLAG)>;
-				};
-			};
-		};
-	};
-
-	motionsense-sensor-info {
-		compatible = "cros-ec,motionsense-sensor-info";
-
-		/*
-		 * list of GPIO interrupts that have to
-		 * be enabled at initial stage
-		 */
-		sensor-irqs = <&gpio_accel_gyro_int_l>;
-		/* list of sensors in force mode */
-		accel-force-mode-sensors = <&lid_accel>;
-	};
-};
diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf
deleted file mode 100644
index e16994e327..0000000000
--- a/zephyr/projects/trogdor/lazor/prj.conf
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-CONFIG_CROS_EC=y
-CONFIG_SHIMMED_TASKS=y
-CONFIG_PLATFORM_EC=y
-CONFIG_PLATFORM_EC_BRINGUP=y
-CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
-CONFIG_PLATFORM_EC_SWITCH=y
-CONFIG_PLATFORM_EC_LID_SWITCH=y
-CONFIG_PLATFORM_EC_BACKLIGHT_LID=y
-CONFIG_PLATFORM_EC_POWER_BUTTON=y
-CONFIG_I2C=y
-
-# LED
-CONFIG_PLATFORM_EC_LED_COMMON=y
-
-# PWM
-CONFIG_PWM=y
-CONFIG_PWM_SHELL=n
-CONFIG_PLATFORM_EC_PWM=y
-CONFIG_PLATFORM_EC_PWM_DISPLIGHT=y
-CONFIG_PLATFORM_EC_PWM_KBLIGHT=y
-
-# Application Processor is Qualcomm SC7180
-CONFIG_AP_ARM_QUALCOMM_SC7180=y
-
-# Board version is selected over GPIO board ID pins.
-CONFIG_PLATFORM_EC_BOARD_VERSION_GPIO=y
-
-# LN9310 Switchcap
-CONFIG_PLATFORM_EC_SWITCHCAP_LN9310=y
-
-# Power Sequencing
-CONFIG_PLATFORM_EC_POWERSEQ=y
-CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y
-CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y
-CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y
-CONFIG_PLATFORM_EC_CHIPSET_RESUME_INIT_HOOK=y
-
-# Trogdor family does not use EFS2
-CONFIG_PLATFORM_EC_VBOOT_EFS2=n
-
-# MKBP event mask
-CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK=y
-CONFIG_PLATFORM_EC_MKBP_HOST_EVENT_WAKEUP_MASK=y
-
-# MKBP event
-CONFIG_PLATFORM_EC_MKBP_EVENT=y
-CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y
-
-# Keyboard
-CONFIG_PLATFORM_EC_KEYBOARD=y
-CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y
-CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y
-CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y
-CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y
-CONFIG_PLATFORM_EC_CMD_BUTTON=y
-CONFIG_CROS_KB_RAW_NPCX=y
-
-# ADC
-CONFIG_PLATFORM_EC_ADC=y
-CONFIG_ADC=y
-CONFIG_ADC_SHELL=n
-
-# Battery
-CONFIG_HAS_TASK_USB_CHG_P1=y
-CONFIG_PLATFORM_EC_BATTERY=y
-CONFIG_PLATFORM_EC_BATTERY_SMART=y
-CONFIG_PLATFORM_EC_I2C_VIRTUAL_BATTERY=y
-CONFIG_PLATFORM_EC_I2C_PASSTHRU_RESTRICTED=y
-CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
-CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
-CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y
-CONFIG_PLATFORM_EC_CHARGER_ISL9238=y
-CONFIG_PLATFORM_EC_CHARGE_RAMP_HW=y
-CONFIG_PLATFORM_EC_USE_BATTERY_DEVICE_CHEMISTRY=y
-CONFIG_PLATFORM_EC_BATTERY_DEVICE_CHEMISTRY="LION"
-CONFIG_PLATFORM_EC_BATTERY_REVIVE_DISCONNECT=y
-CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y
-CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC_CHARGER=y
-CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON=2
-CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON=10000
-CONFIG_PLATFORM_EC_CHARGER_PROFILE_OVERRIDE=y
-CONFIG_PLATFORM_EC_CHARGER_PSYS=y
-CONFIG_PLATFORM_EC_CHARGER_PSYS_READ=y
-CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10
-CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=20
-CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y
-
-# USB-A
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1
-
-# USB-C
-CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y
-CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=n
-CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
-CONFIG_PLATFORM_EC_USBC_RETIMER_FW_UPDATE=n
-CONFIG_PLATFORM_EC_USBC_SS_MUX_DFP_ONLY=y
-CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
-CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y
-CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y
-CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
-CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT=2
-CONFIG_PLATFORM_EC_USB_PD_REV30=n
-CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_MULTI_PS8XXX=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8751=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8805=y
-CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=n
-CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
-CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
-CONFIG_HAS_TASK_PD_C1=y
-CONFIG_HAS_TASK_PD_INT_C1=y
-
-# USB ID
-# This is allocated specifically for Trogdor
-# http://google3/hardware/standards/usb/
-# TODO(b/183608112): Move to device tree
-CONFIG_PLATFORM_EC_USB_PID=0x5043
-
-# RTC
-CONFIG_PLATFORM_EC_RTC=y
-CONFIG_CROS_RTC_NPCX=y
-CONFIG_PLATFORM_EC_HOSTCMD_RTC=y
-CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC=y
-
-# EC software sync
-CONFIG_PLATFORM_EC_VBOOT_HASH=y
-
-# Serial Host Interface (SHI) device.
-CONFIG_CROS_SHI_NPCX=y
-
-# Sensors
-CONFIG_PLATFORM_EC_MOTIONSENSE=y
-CONFIG_PLATFORM_EC_ACCEL_FIFO=y
-CONFIG_PLATFORM_EC_ACCEL_INTERRUPTS=y
-CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS=y
-CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO=y
-CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y
-CONFIG_PLATFORM_EC_LID_ANGLE=y
-CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y
-CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y
-CONFIG_PLATFORM_EC_TABLET_MODE=y
-CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=y
-
-# Sensor Drivers
-CONFIG_PLATFORM_EC_ACCEL_BMA255=y
-CONFIG_PLATFORM_EC_ACCELGYRO_BMI160=y
-CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_I2C=y
-
-# Console history
-CONFIG_SHELL_HISTORY=y
-CONFIG_SHELL_CMDS=y
-
-# Taskinfo
-CONFIG_THREAD_MONITOR=y
-CONFIG_KERNEL_SHELL=y
-
-CONFIG_SYSCON=y
-
-# Features should be enabled. But the code RAM is not enough, disable them.
-#CONFIG_PLATFORM_EC_ACCEL_SPOOF_MODE=y
-#CONFIG_PLATFORM_EC_EMULATED_SYSRQ=y
diff --git a/zephyr/projects/trogdor/lazor/src/i2c.c b/zephyr/projects/trogdor/lazor/src/i2c.c
deleted file mode 100644
index a7ce970843..0000000000
--- a/zephyr/projects/trogdor/lazor/src/i2c.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "i2c/i2c.h"
-#include "i2c.h"
-
-/* Lazor board specific i2c implementation */
-
-#ifdef CONFIG_PLATFORM_EC_I2C_PASSTHRU_RESTRICTED
-int board_allow_i2c_passthru(int port)
-{
-	return (i2c_get_device_for_port(port) ==
-		i2c_get_device_for_port(I2C_PORT_VIRTUAL_BATTERY));
-}
-#endif
diff --git a/zephyr/projects/trogdor/lazor/src/led.c b/zephyr/projects/trogdor/lazor/src/led.c
deleted file mode 100644
index e4b34576c8..0000000000
--- a/zephyr/projects/trogdor/lazor/src/led.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Power and battery LED control.
- */
-
-#include "battery.h"
-#include "charge_manager.h"
-#include "charge_state.h"
-#include "chipset.h"
-#include "ec_commands.h"
-#include "gpio.h"
-#include "hooks.h"
-#include "host_command.h"
-#include "led_common.h"
-#include "system.h"
-#include "util.h"
-
-#define LED_ONE_SEC (1000 / HOOK_TICK_INTERVAL_MS)
-
-#define BAT_LED_ON 1
-#define BAT_LED_OFF 0
-
-const enum ec_led_id supported_led_ids[] = {
-	EC_LED_ID_BATTERY_LED,
-};
-
-const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
-
-enum led_color {
-	LED_OFF = 0,
-	LED_AMBER,
-	LED_BLUE,
-	LED_COLOR_COUNT  /* Number of colors, not a color itself */
-};
-
-static void led_set_color(enum led_color color)
-{
-	gpio_set_level(GPIO_EC_CHG_LED_Y_C1,
-		(color == LED_AMBER) ? BAT_LED_ON : BAT_LED_OFF);
-	gpio_set_level(GPIO_EC_CHG_LED_B_C1,
-		(color == LED_BLUE) ? BAT_LED_ON : BAT_LED_OFF);
-}
-
-void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
-{
-	brightness_range[EC_LED_COLOR_AMBER] = 1;
-	brightness_range[EC_LED_COLOR_BLUE] = 1;
-}
-
-int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
-{
-	if (brightness[EC_LED_COLOR_BLUE] != 0)
-		led_set_color(LED_BLUE);
-	else if (brightness[EC_LED_COLOR_AMBER] != 0)
-		led_set_color(LED_AMBER);
-	else
-		led_set_color(LED_OFF);
-
-	return EC_SUCCESS;
-}
-
-static void board_led_set_battery(void)
-{
-	static int battery_ticks;
-	int color = LED_OFF;
-	int period = 0;
-	uint32_t chflags = charge_get_flags();
-
-	battery_ticks++;
-
-	switch (charge_get_state()) {
-	case PWR_STATE_CHARGE:
-		/* Always indicate amber on when charging. */
-		color = LED_AMBER;
-		break;
-	case PWR_STATE_DISCHARGE:
-		if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND)) {
-			/* Discharging in S3: Amber 1 sec, off 3 sec */
-			period = (1 + 3) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 1 * LED_ONE_SEC)
-				color = LED_AMBER;
-			else
-				color = LED_OFF;
-		} else if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) {
-			/* Discharging in S5: off */
-			color = LED_OFF;
-		} else if (chipset_in_state(CHIPSET_STATE_ON)) {
-			/* Discharging in S0: Blue on */
-			color = LED_BLUE;
-		}
-		break;
-	case PWR_STATE_ERROR:
-		/* Battery error: Amber 1 sec, off 1 sec */
-		period = (1 + 1) * LED_ONE_SEC;
-		battery_ticks = battery_ticks % period;
-		if (battery_ticks < 1 * LED_ONE_SEC)
-			color = LED_AMBER;
-		else
-			color = LED_OFF;
-		break;
-	case PWR_STATE_CHARGE_NEAR_FULL:
-		/* Full Charged: Blue on */
-		color = LED_BLUE;
-		break;
-	case PWR_STATE_IDLE: /* External power connected in IDLE */
-		if (chflags & CHARGE_FLAG_FORCE_IDLE) {
-			/* Factory mode: Blue 2 sec, Amber 2 sec */
-			period = (2 + 2) * LED_ONE_SEC;
-			battery_ticks = battery_ticks % period;
-			if (battery_ticks < 2 * LED_ONE_SEC)
-				color = LED_BLUE;
-			else
-				color = LED_AMBER;
-		} else
-			color = LED_BLUE;
-		break;
-	default:
-		/* Other states don't alter LED behavior */
-		break;
-	}
-
-	led_set_color(color);
-}
-
-/* Called by hook task every TICK */
-static void led_tick(void)
-{
-	if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
-		board_led_set_battery();
-}
-DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT);
-
-void led_control(enum ec_led_id led_id, enum ec_led_state state)
-{
-	enum led_color color;
-
-	if ((led_id != EC_LED_ID_RECOVERY_HW_REINIT_LED) &&
-	    (led_id != EC_LED_ID_SYSRQ_DEBUG_LED))
-		return;
-
-	if (state == LED_STATE_RESET) {
-		led_auto_control(EC_LED_ID_BATTERY_LED, 1);
-		board_led_set_battery();
-		return;
-	}
-
-	color = state ? LED_BLUE : LED_OFF;
-
-	led_auto_control(EC_LED_ID_BATTERY_LED, 0);
-
-	led_set_color(color);
-}
diff --git a/zephyr/projects/trogdor/lazor/zmake.yaml b/zephyr/projects/trogdor/lazor/zmake.yaml
deleted file mode 100644
index c1c14d07d5..0000000000
--- a/zephyr/projects/trogdor/lazor/zmake.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-board: trogdor
-dts-overlays:
-  - battery.dts
-  - gpio.dts
-  - keyboard.dts
-  - motionsense.dts
-supported-toolchains:
-  - coreboot-sdk
-  - zephyr
-supported-zephyr-versions:
-  - v2.6
-output-type: npcx