summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordnojiri <dnojiri@chromium.org>2019-12-10 09:04:46 -0800
committerCommit Bot <commit-bot@chromium.org>2019-12-23 15:07:25 +0000
commitf8f132954162a594598cf667597b4c978ba2714b (patch)
tree7a62e972de1ba2f1b7a0500230d20fe6aff989a8
parent6722866133cc68761c06e4c0475fc9449f179cec (diff)
downloadchrome-ec-f8f132954162a594598cf667597b4c978ba2714b.tar.gz
akemi: Remove CONFIG_EC_FEATURE_BOARD_OVERRIDE
CONFIG_EC_FEATURE_BOARD_OVERRIDE is deprecated by CL:1951810. Signed-off-by: dnojiri <dnojiri@chromium.org> BUG=none BRANCH=none TEST=buildall Change-Id: I2e8a66b47bb5a29184dae0d7ba56381f5b1f59e4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1960490 Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org> Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Auto-Submit: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1979570 Tested-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Commit-Queue: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--board/akemi/board.c7
-rw-r--r--board/akemi/board.h2
2 files changed, 1 insertions, 8 deletions
diff --git a/board/akemi/board.c b/board/akemi/board.c
index 7356f1ac0a..688b069294 100644
--- a/board/akemi/board.c
+++ b/board/akemi/board.c
@@ -375,7 +375,7 @@ void board_overcurrent_event(int port, int is_overcurrented)
gpio_set_level(GPIO_USB_C_OC_ODL, !is_overcurrented);
}
-uint32_t board_override_feature_flags0(uint32_t flags0)
+__override uint32_t board_override_feature_flags0(uint32_t flags0)
{
uint8_t sku = get_board_sku();
/*
@@ -389,8 +389,3 @@ uint32_t board_override_feature_flags0(uint32_t flags0)
else
return flags0;
}
-
-uint32_t board_override_feature_flags1(uint32_t flags1)
-{
- return flags1;
-}
diff --git a/board/akemi/board.h b/board/akemi/board.h
index 947837e212..4dbcb1aaa7 100644
--- a/board/akemi/board.h
+++ b/board/akemi/board.h
@@ -29,8 +29,6 @@
/* Keyboard features */
#define CONFIG_PWM_KBLIGHT
-#define CONFIG_EC_FEATURE_BOARD_OVERRIDE
-
/* Sensors */
/* LSM6DS3TR-C Base accel/gyro */
#define CONFIG_ACCEL_INTERRUPTS