diff options
author | Rob Barnes <robbarnes@google.com> | 2020-12-08 15:15:18 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-12-10 01:15:52 +0000 |
commit | 18fa1e4386244d8408d3c9ecef519d27ca01d19f (patch) | |
tree | 58c1fba57759eca96571af3e16e001f6676c1836 /board/guybrush | |
parent | c9d96b69410f496d4aea21bce5ef4cef9b0fd5fa (diff) | |
download | chrome-ec-18fa1e4386244d8408d3c9ecef519d27ca01d19f.tar.gz |
Guybrush: Move implementation to baseboard
Create a base_gpio.inc and base_ec.tasklist. Move nearly all the
implementation to the baseboard. Parts of the implementation can be
moved to the boards as needed.
BUG=None
TEST=Build
BRANCH=None
Change-Id: I3b6ae7539b152d8078f8ef49d7da143a6283d8d4
Signed-off-by: Rob Barnes <robbarnes@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2579647
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'board/guybrush')
-rw-r--r-- | board/guybrush/board.h | 21 | ||||
-rw-r--r-- | board/guybrush/build.mk | 3 | ||||
-rw-r--r-- | board/guybrush/ec.tasklist | 7 | ||||
-rw-r--r-- | board/guybrush/gpio.inc | 30 |
4 files changed, 5 insertions, 56 deletions
diff --git a/board/guybrush/board.h b/board/guybrush/board.h index 62429e7ee0..8a4a51e549 100644 --- a/board/guybrush/board.h +++ b/board/guybrush/board.h @@ -11,27 +11,6 @@ /* Baseboard features */ #include "baseboard.h" -/* Optional features */ -#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ - -/* Config options automatically enabled, re-enable once support added */ -#undef CONFIG_ADC -#undef CONFIG_SWITCH -#undef CONFIG_SPI_FLASH -#undef CONFIG_SUPPORT_CHIP_HIBERNATION - -#undef CONFIG_UART_TX_BUF_SIZE -#define CONFIG_UART_TX_BUF_SIZE 4096 - -/* - * Macros for GPIO signals used in common code that don't match the - * schematic names. Signal names in gpio.inc match the schematic and are - * then redefined here to so it's more clear which signal is being used for - * which purpose. - */ -#define GPIO_LID_OPEN GPIO_EC_LID_OPEN -#define GPIO_WP_L GPIO_EC_WP_L - /* Motion sensing drivers */ /* Keyboard features */ diff --git a/board/guybrush/build.mk b/board/guybrush/build.mk index c80f89c69a..c76e04a0b7 100644 --- a/board/guybrush/build.mk +++ b/board/guybrush/build.mk @@ -6,9 +6,6 @@ # Board specific files build # -CHIP:=npcx -CHIP_FAMILY:=npcx9 -CHIP_VARIANT:=npcx9m3f BASEBOARD:=guybrush board-y=board.o diff --git a/board/guybrush/ec.tasklist b/board/guybrush/ec.tasklist index 773d62c8cb..2dc9c26ec2 100644 --- a/board/guybrush/ec.tasklist +++ b/board/guybrush/ec.tasklist @@ -7,7 +7,6 @@ * See CONFIG_TASK_LIST in config.h for details. */ -#define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(HOSTCMD, host_command_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, VENTI_TASK_STACK_SIZE) +#include "base_ec.tasklist" + +#define CONFIG_TASK_LIST BASEBOARD_CONFIG_TASK_LIST diff --git a/board/guybrush/gpio.inc b/board/guybrush/gpio.inc index 852f23c55d..06908e3a67 100644 --- a/board/guybrush/gpio.inc +++ b/board/guybrush/gpio.inc @@ -5,32 +5,6 @@ * found in the LICENSE file. */ -/* Declare symbolic names for all the GPIOs that we care about. - * Note: Those with interrupt handlers must be declared first. */ +/* Declare symbolic names for all the GPIOs that we care about. */ -/* Wake Source interrupts */ -GPIO_INT(LID_OPEN, PIN(0, 2), GPIO_INT_BOTH, switch_interrupt) -GPIO_INT(EC_WP_L, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) - -/* Power sequencing interrupts */ - -/* Sensor Interrupts */ - -/* USB-C interrupts */ - -/* HDMI interrupts */ - -/* Volume button interrupts */ - -/* AP Signals */ -UNIMPLEMENTED(ENTERING_RW) /* GPIO_ENTERING_RW */ - -/* USB and USBC Signals */ - -/* Misc Signals */ - -/* UART */ - -/* I2C pins - these will be reconfigured for alternate function below */ - -/* Power Switch Logic (PSL) inputs */ +#include "base_gpio.inc" |