diff options
| author | Nicolas Boichat <drinkcat@chromium.org> | 2019-08-07 13:55:56 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-12 05:39:16 +0000 |
| commit | 890e06949e382175954bd82a84586c69c0d77a57 (patch) | |
| tree | 40e9f25580e302526878574696bd86fdbf98abb7 | |
| parent | e4440d52945fef7e5f3c98911f50363e65fc488e (diff) | |
| download | chrome-ec-890e06949e382175954bd82a84586c69c0d77a57.tar.gz | |
hammer: Add masterball board
A close hammer derivative.
BRANCH=none
BUG=b:138968914
TEST=make BOARD=masterball -j
Flash into staff, see the board boot:
util/flash_ec --board=masterball --port=9000
Change-Id: I9f8d897c23d0f53557c6d6789c33e5b776dca982
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1741589
Reviewed-by: Wei-Han Chen <stimim@chromium.org>
Reviewed-by: Yilun Lin <yllin@chromium.org>
| -rw-r--r-- | board/hammer/variants.h | 13 | ||||
| l--------- | board/masterball | 1 | ||||
| -rwxr-xr-x | util/flash_ec | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/board/hammer/variants.h b/board/hammer/variants.h index e520a0b450..58c320a113 100644 --- a/board/hammer/variants.h +++ b/board/hammer/variants.h @@ -15,6 +15,8 @@ /* USB ID */ #ifdef BOARD_HAMMER #define CONFIG_USB_PID 0x5022 +#elif defined(BOARD_MASTERBALL) +#define CONFIG_USB_PID 0x503c #elif defined(BOARD_STAFF) #define CONFIG_USB_PID 0x502b #elif defined(BOARD_WAND) @@ -36,6 +38,15 @@ #define CONFIG_USB_HID_TOUCHPAD_PHYSICAL_MAX_X 1018 /* tenth of mm */ #define CONFIG_USB_HID_TOUCHPAD_PHYSICAL_MAX_Y 566 /* tenth of mm */ #define CONFIG_TOUCHPAD_VIRTUAL_SIZE (48*1024) +#elif defined(BOARD_MASTERBALL) +#define HAS_I2C_TOUCHPAD +/* TODO(b:138422450): Insert correct dimensions. */ +#define CONFIG_USB_HID_TOUCHPAD_LOGICAL_MAX_X 3206 +#define CONFIG_USB_HID_TOUCHPAD_LOGICAL_MAX_Y 1832 +#define CONFIG_USB_HID_TOUCHPAD_LOGICAL_MAX_PRESSURE 511 +#define CONFIG_USB_HID_TOUCHPAD_PHYSICAL_MAX_X 1017 /* tenth of mm */ +#define CONFIG_USB_HID_TOUCHPAD_PHYSICAL_MAX_Y 581 /* tenth of mm */ +#define CONFIG_TOUCHPAD_VIRTUAL_SIZE (56*1024) #elif defined(BOARD_STAFF) #define HAS_I2C_TOUCHPAD #define CONFIG_USB_HID_TOUCHPAD_LOGICAL_MAX_X 3206 @@ -71,7 +82,7 @@ #endif /* Hall sensor for tablet mode detection */ -#ifdef BOARD_WHISKERS +#if defined(BOARD_MASTERBALL) || defined(BOARD_WHISKERS) #define CONFIG_HALL_SENSOR #endif diff --git a/board/masterball b/board/masterball new file mode 120000 index 0000000000..7f4a914148 --- /dev/null +++ b/board/masterball @@ -0,0 +1 @@ +hammer
\ No newline at end of file diff --git a/util/flash_ec b/util/flash_ec index 7a46a692ee..226e4ee533 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -62,6 +62,7 @@ BOARDS_STM32=( glados_pd hatch_fp jerry + masterball minimuffin nami_fp nocturne_fp |