summaryrefslogtreecommitdiff
path: root/zephyr/projects/trogdor
diff options
context:
space:
mode:
authorAndrew McRae <amcrae@google.com>2022-02-07 17:49:08 +1100
committerCommit Bot <commit-bot@chromium.org>2022-02-07 22:47:44 +0000
commite0c3f1a9291b6f6e215ef86cc76d8acfdd87f87a (patch)
tree0459afbfc11eda6cbd13f956541ce2444c001c3f /zephyr/projects/trogdor
parentf3e701a6d6377b50577041e7c6a4319d009ecab1 (diff)
downloadchrome-ec-e0c3f1a9291b6f6e215ef86cc76d8acfdd87f87a.tar.gz
lazor: Build lazor on Zephyr
Fix NPCX config so that lazor Zephyr image builds and runs. Still has a problem with jumping to RW image. BUG=none TEST=build and run BRANCH=none Signed-off-by: Andrew McRae <amcrae@google.com> Change-Id: Ia61a091c243c80d6d742d67d7c2024656d10b677 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3443520 Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Diffstat (limited to 'zephyr/projects/trogdor')
-rw-r--r--zephyr/projects/trogdor/lazor/gpio.dts54
-rw-r--r--zephyr/projects/trogdor/lazor/prj.conf9
2 files changed, 5 insertions, 58 deletions
diff --git a/zephyr/projects/trogdor/lazor/gpio.dts b/zephyr/projects/trogdor/lazor/gpio.dts
index edcabaf149..3c9ef2c718 100644
--- a/zephyr/projects/trogdor/lazor/gpio.dts
+++ b/zephyr/projects/trogdor/lazor/gpio.dts
@@ -204,60 +204,6 @@
gpio_ec_chg_led_b_c1: ec_chg_led_b_c1 {
gpios = <&gpioc 4 GPIO_OUT_LOW>;
};
- ap_ec_spi_mosi {
- gpios = <&gpio4 6 GPIO_INPUT_PULL_DOWN>;
- };
- ap_ec_spi_miso {
- gpios = <&gpio4 7 GPIO_INPUT_PULL_DOWN>;
- };
- ap_ec_spi_clk {
- gpios = <&gpio5 5 GPIO_INPUT_PULL_DOWN>;
- };
- kb_bl_pwm {
- gpios = <&gpio8 0 GPIO_INPUT>;
- };
- edp_bkltctl {
- gpios = <&gpiob 7 GPIO_INPUT>;
- };
- ppvar_boostin_sense {
- gpios = <&gpio4 4 GPIO_INPUT>;
- };
- charger_iadp {
- gpios = <&gpio4 3 GPIO_INPUT>;
- };
- charger_pmon {
- gpios = <&gpio4 2 GPIO_INPUT>;
- };
- ec_i2c_power_scl {
- gpios = <&gpiob 5 GPIO_INPUT>;
- };
- ec_i2c_power_sda {
- gpios = <&gpiob 4 GPIO_INPUT>;
- };
- ec_i2c_usb_c0_pd_scl {
- gpios = <&gpio9 0 GPIO_INPUT>;
- };
- ec_i2c_usb_c0_pd_sda {
- gpios = <&gpio8 7 GPIO_INPUT>;
- };
- ec_i2c_usb_c1_pd_scl {
- gpios = <&gpio9 2 GPIO_INPUT>;
- };
- ec_i2c_usb_c1_pd_sda {
- gpios = <&gpio9 1 GPIO_INPUT>;
- };
- ec_i2c_eeprom_scl {
- gpios = <&gpio3 3 GPIO_INPUT>;
- };
- ec_i2c_eeprom_sda {
- gpios = <&gpio3 6 GPIO_INPUT>;
- };
- ec_i2c_sensor_scl {
- gpios = <&gpiob 3 GPIO_INPUT>;
- };
- ec_i2c_sensor_sda {
- gpios = <&gpiob 2 GPIO_INPUT>;
- };
gpio_brd_id0: brd_id0 {
gpios = <&gpioc 7 GPIO_INPUT>;
enum-name = "GPIO_BOARD_VERSION1";
diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf
index f47eb7e437..180617f61d 100644
--- a/zephyr/projects/trogdor/lazor/prj.conf
+++ b/zephyr/projects/trogdor/lazor/prj.conf
@@ -3,6 +3,7 @@
# found in the LICENSE file.
CONFIG_CROS_EC=y
+CONFIG_SOC_NPCX7M6FC=y
CONFIG_SHIMMED_TASKS=y
CONFIG_PLATFORM_EC=y
CONFIG_PLATFORM_EC_BRINGUP=y
@@ -11,7 +12,7 @@ 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
+CONFIG_PLATFORM_EC_I2C=y
# LED
CONFIG_PLATFORM_EC_LED_COMMON=y
@@ -148,12 +149,12 @@ CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_I2C=y
# Console history
CONFIG_SHELL_HISTORY=y
CONFIG_SHELL_CMDS=y
-CONFIG_SHELL_HELP=y
-CONFIG_SHELL_MINIMAL=n
+CONFIG_SHELL_HELP=n
+CONFIG_SHELL_MINIMAL=y
# Taskinfo
CONFIG_THREAD_MONITOR=y
-CONFIG_KERNEL_SHELL=y
+CONFIG_KERNEL_SHELL=n
CONFIG_SYSCON=y