diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2021-04-06 23:34:48 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-07 07:17:04 +0000 |
| commit | 575d7686274bc97f3b7ddae2e3b5f4171290d6fd (patch) | |
| tree | 05a58fb6dafa421c46a79597cdc32459f1959609 /board/hatch_fp/board_rw.c | |
| parent | 7fba0e12ffa1d48c9f9f6da9d18125adc9aa75b4 (diff) | |
| download | chrome-ec-575d7686274bc97f3b7ddae2e3b5f4171290d6fd.tar.gz | |
Revert "fpsensor: Support building firmware that works for both sensors"
This reverts commit ac08c9d1dbc9f587df3ee6b15d58c0203f7e356e.
Reason for revert: Breaks public build
Original change's description:
> fpsensor: Support building firmware that works for both sensors
>
> This is a refactoring to allow building FPMCU firmware that works for
> one FPC sensor and one ELAN sensor.
>
> 1. When both drivers implement our common functions, e.g. fp_sensor_init(),
> rename them to fp_sensor_init_fpc() and fp_sensor_init_elan().
> 2. There are a few functions implemented not in FPC driver but in FPC
> private library, e.g. fp_sensor_finger_status(). I kept this as-is for
> FPC but renamed the one in ELAN driver to fp_sensor_finger_status_elan()
> 3. If building for ELAN, need to hardcode elan=1 in hatch_fp/board.c
> because the sensor type GPIO always says FPC.
>
> BRANCH=none
> BUG=b:175158241
> TEST=make run-fpsensor; make run-fpsensor_status;
> make run-fpsensor_crypto
> TEST=make -j BOARD=dartmonkey
> TEST=add CONFIG_FP_SENSOR_ELAN515 to board/hatch_fp/board.h;
> make -j BOARD=bloonchipper
> Firmware binary fully works on Dragonair (FPC) and Voema (ELAN)
> TEST=run device tests with http://crrev/c/2750547 and
> http://crrev/i/3654297 on Dragonclaw, all pass
>
> Change-Id: I789090dbdfe35ac6aefd6a629fa4c7bde89dc437
> Signed-off-by: Yicheng Li <yichengli@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2727971
> Reviewed-by: Tom Hughes <tomhughes@chromium.org>
> Commit-Queue: Tom Hughes <tomhughes@chromium.org>
Bug: b:175158241, b:184616069
Change-Id: I2a02a6eefc316e7e13aa188f1ae16672dce2babd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2809521
Auto-Submit: Tom Hughes <tomhughes@chromium.org>
Tested-by: Tom Hughes <tomhughes@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: caveh jalali <caveh@chromium.org>
Diffstat (limited to 'board/hatch_fp/board_rw.c')
| -rw-r--r-- | board/hatch_fp/board_rw.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/board/hatch_fp/board_rw.c b/board/hatch_fp/board_rw.c index a3dbcbf84f..40ab5092a7 100644 --- a/board/hatch_fp/board_rw.c +++ b/board/hatch_fp/board_rw.c @@ -5,10 +5,7 @@ #include "common.h" #include "console.h" -#include "fpsensor.h" #include "fpsensor_detect.h" -#include "fpsensor_elan.h" -#include "fpsensor_fpc.h" #include "gpio.h" #include "hooks.h" #include "registers.h" @@ -79,24 +76,6 @@ static void configure_fp_sensor_spi(void) void board_init_rw(void) { enum fp_transport_type ret_transport = get_fp_transport_type(); - enum fp_sensor_type sensor_type = get_fp_sensor_type(); - - if (sensor_type == FP_SENSOR_TYPE_ELAN) { - if (IS_ENABLED(CONFIG_FP_SENSOR_ELAN80) || - IS_ENABLED(CONFIG_FP_SENSOR_ELAN515)) { - fp_driver = &fp_driver_elan; - } - } else if (sensor_type == FP_SENSOR_TYPE_FPC) { - if (IS_ENABLED(CONFIG_FP_SENSOR_FPC1025) || - IS_ENABLED(CONFIG_FP_SENSOR_FPC1035) || - IS_ENABLED(CONFIG_FP_SENSOR_FPC1145)) { - fp_driver = &fp_driver_fpc; - } - } - - if (fp_driver == NULL) { - ccprints("Failed to get sensor type!"); - } if (ret_transport == FP_TRANSPORT_TYPE_UART) { /* |