diff options
| author | Eric Yilun Lin <yllin@chromium.org> | 2020-11-11 11:32:35 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-11-11 06:12:38 +0000 |
| commit | 9438922dc9332fed7b4e8cf7dc7d2345b00b7ba1 (patch) | |
| tree | 21cb16208c69f84dc04e3837b022e61c28bd5fb3 | |
| parent | 9faa2e488a366741aa87e8212822942caf64b087 (diff) | |
| download | chrome-ec-9438922dc9332fed7b4e8cf7dc7d2345b00b7ba1.tar.gz | |
asruada: use hayato image as asurada
Deprecate asurada image and use hayato image instead.
Define BOARD_ASURADA_REV0 to get the old asurada image back.
BUG=none
TEST=make buildall -j
BRANCH=none
Change-Id: I10bc67bf36337158d30918e2b77070328b963f33
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2530816
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | board/asurada/board.c | 8 | ||||
| -rw-r--r-- | board/asurada/board.h | 6 | ||||
| -rw-r--r-- | board/asurada/gpio.inc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/board/asurada/board.c b/board/asurada/board.c index f046734b2c..c03db32cb2 100644 --- a/board/asurada/board.c +++ b/board/asurada/board.c @@ -620,7 +620,7 @@ static struct mutex g_lid_mutex; static struct bmi_drv_data_t g_bmi160_data; static struct stprivate_data g_lis2dwl_data; -#ifdef BOARD_ASURADA +#ifdef BOARD_ASURADA_REV0 /* Matrix to rotate accelerometer into standard reference frame */ /* for rev 0 */ static const mat33_fp_t base_standard_ref_rev0 = { @@ -690,7 +690,7 @@ static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = { .saturation.again = TCS_DEFAULT_AGAIN, .saturation.atime = TCS_DEFAULT_ATIME, }; -#endif /* BOARD_ASURADA */ +#endif /* BOARD_ASURADA_REV0 */ struct motion_sensor_t motion_sensors[] = { /* @@ -770,7 +770,7 @@ struct motion_sensor_t motion_sensors[] = { }, }, }, -#ifdef BOARD_ASURADA +#ifdef BOARD_ASURADA_REV0 [CLEAR_ALS] = { .name = "Clear Light", .active_mask = SENSOR_ACTIVE_S0_S3, @@ -806,6 +806,6 @@ struct motion_sensor_t motion_sensors[] = { .min_frequency = 0, .max_frequency = 0, }, -#endif /* BOARD_ASURADA */ +#endif /* BOARD_ASURADA_REV0 */ }; const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); diff --git a/board/asurada/board.h b/board/asurada/board.h index 5880d0a121..d3f5f8d298 100644 --- a/board/asurada/board.h +++ b/board/asurada/board.h @@ -19,7 +19,7 @@ #define CONFIG_SYSTEM_UNLOCKED #define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_EXTPOWER_GPIO -#ifdef BOARD_ASURADA +#ifdef BOARD_ASURADA_REV0 /* For Rev0 only */ #define CONFIG_IT83XX_VCC_1P8V #else @@ -173,7 +173,7 @@ #define CONFIG_CMD_ACCEL_INFO #define CONFIG_CMD_ACCELS -#ifdef BOARD_ASURADA +#ifdef BOARD_ASURADA_REV0 #define CONFIG_ALS #define ALS_COUNT 1 #define CONFIG_ALS_TCS3400 @@ -273,7 +273,7 @@ enum sensor_id { BASE_ACCEL = 0, BASE_GYRO, LID_ACCEL, -#ifdef BOARD_ASURADA +#ifdef BOARD_ASURADA_REV0 CLEAR_ALS, RGB_ALS, #endif diff --git a/board/asurada/gpio.inc b/board/asurada/gpio.inc index 11e5a57cae..6160663516 100644 --- a/board/asurada/gpio.inc +++ b/board/asurada/gpio.inc @@ -33,7 +33,7 @@ GPIO_INT(BASE_IMU_INT_L, PIN(J, 2), GPIO_INT_FALLING | GPIO_SEL_1P8V, bmi160_interrupt) GPIO_INT(LID_ACCEL_INT_L, PIN(J, 3), GPIO_INT_FALLING | GPIO_SEL_1P8V, lis2dw12_interrupt) -#ifdef BOARD_ASURADA +#ifdef BOARD_ASURADA_REV0 GPIO_INT(ALS_RGB_INT_ODL, PIN(F, 0), GPIO_INT_FALLING, tcs3400_interrupt) #endif @@ -51,7 +51,7 @@ GPIO_INT(VOLUME_UP_L, PIN(D, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* EC_VOLUP_BTN_ODL */ /* Other interrupts */ -#ifdef BOARD_ASURADA +#ifdef BOARD_ASURADA_REV0 GPIO_INT(AC_PRESENT, PIN(M, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) /* AC_OK / AC_PRESENT in rev0 */ #else /* HAYATO */ |