summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@google.com>2021-07-02 16:47:58 -0700
committerCommit Bot <commit-bot@chromium.org>2021-07-09 21:10:26 +0000
commit2c37de83e78e98820ce2a7473932afdec029d2a6 (patch)
treec4c43bcced79adabb1cf6b785633f122b64e8329 /board
parent107738848df07a66ae4d7c5af8f73a98ca555224 (diff)
downloadchrome-ec-2c37de83e78e98820ce2a7473932afdec029d2a6.tar.gz
system: Clean up system_get_board_version()
Refactor system_get_board_version() a bit so that we can remove CONFIG_BOARD_VERSION_CUSTOM and CONFIG_BOARD_VERSION from config.h. BRANCH=None BUG=b:186264627 TEST=make buildall -j TEST=zmake testall Cq-Depend: chromium:3015243 Change-Id: Id5ab809493c297b7d330ea13dcd6934ec00042a6 Signed-off-by: Philip Chen <philipchen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3004112 Commit-Queue: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Keith Short <keithshort@chromium.org> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/atlas/board.h1
-rw-r--r--board/coral/board.h1
-rw-r--r--board/eve/board.h1
-rw-r--r--board/glkrvp/board.h1
-rw-r--r--board/glkrvp_ite/board.h1
-rw-r--r--board/lazor/board.h3
-rw-r--r--board/nautilus/board.h1
-rw-r--r--board/nocturne/board.h1
-rw-r--r--board/poppy/board.h1
-rw-r--r--board/rainier/board.h1
-rw-r--r--board/reef/board.h1
-rw-r--r--board/reef_it8320/board.h1
-rw-r--r--board/reef_mchp/board.h1
-rw-r--r--board/scarlet/board.h1
-rw-r--r--board/servo_v4/board.h1
-rw-r--r--board/servo_v4p1/board.h2
16 files changed, 0 insertions, 19 deletions
diff --git a/board/atlas/board.h b/board/atlas/board.h
index 95c9b2d1f8..bc4844ee53 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -18,7 +18,6 @@
/* EC */
#define CONFIG_ADC
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_BOARD_FORCE_RESET_PIN
#define CONFIG_DPTF
#define CONFIG_FPU
diff --git a/board/coral/board.h b/board/coral/board.h
index 7f9937af1d..4316d991f1 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -115,7 +115,6 @@
/* EC */
#define CONFIG_ADC
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_EXTPOWER_GPIO
#undef CONFIG_EXTPOWER_DEBOUNCE_MS
#define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/eve/board.h b/board/eve/board.h
index 9f44e8862d..6061f498a2 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -19,7 +19,6 @@
/* EC */
#define CONFIG_ADC
#define CONFIG_BACKLIGHT_LID
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_BOARD_FORCE_RESET_PIN
#define CONFIG_DEVICE_EVENT
#define CONFIG_DPTF
diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h
index 0ee352bfab..6f1e7c3738 100644
--- a/board/glkrvp/board.h
+++ b/board/glkrvp/board.h
@@ -85,7 +85,6 @@
#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE
/* EC */
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_VOLUME_BUTTONS
#define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL
#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL
diff --git a/board/glkrvp_ite/board.h b/board/glkrvp_ite/board.h
index 7ad5966853..2816a02f86 100644
--- a/board/glkrvp_ite/board.h
+++ b/board/glkrvp_ite/board.h
@@ -85,7 +85,6 @@
#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE
/* EC */
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_VOLUME_BUTTONS
#define CONFIG_LID_SWITCH
#define CONFIG_WP_ALWAYS
diff --git a/board/lazor/board.h b/board/lazor/board.h
index 5400e471bb..937f34e709 100644
--- a/board/lazor/board.h
+++ b/board/lazor/board.h
@@ -13,9 +13,6 @@
/* Internal SPI flash on NPCX7 */
#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) /* 512KB internal spi flash */
-/* Custom the board version using tristate */
-#define CONFIG_BOARD_VERSION_CUSTOM
-
/* Switchcap */
#define CONFIG_LN9310
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index 858d9b91a2..88389956b9 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -17,7 +17,6 @@
/* EC */
#define CONFIG_ADC
#define CONFIG_BACKLIGHT_LID
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_BOARD_FORCE_RESET_PIN
#define CONFIG_CASE_CLOSED_DEBUG_EXTERNAL
#define CONFIG_DPTF
diff --git a/board/nocturne/board.h b/board/nocturne/board.h
index a025f310ae..95f8d14403 100644
--- a/board/nocturne/board.h
+++ b/board/nocturne/board.h
@@ -30,7 +30,6 @@
/* EC modules */
#define CONFIG_ADC
#define CONFIG_BACKLIGHT_LID
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_HOSTCMD_ESPI
#define CONFIG_I2C
#define CONFIG_I2C_BUS_MAY_BE_UNPOWERED
diff --git a/board/poppy/board.h b/board/poppy/board.h
index ae134e8b66..bf4acfe8ff 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -17,7 +17,6 @@
/* EC */
#define CONFIG_ADC
#define CONFIG_BACKLIGHT_LID
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_BOARD_FORCE_RESET_PIN
#define CONFIG_BUTTON_TRIGGERED_RECOVERY
#define CONFIG_DETACHABLE_BASE
diff --git a/board/rainier/board.h b/board/rainier/board.h
index 372ab53616..a323a90889 100644
--- a/board/rainier/board.h
+++ b/board/rainier/board.h
@@ -42,7 +42,6 @@
/* Optional features */
#define CONFIG_BOARD_PRE_INIT
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_BUTTON_TRIGGERED_RECOVERY
#define CONFIG_CHARGER_ILIM_PIN_DISABLED
#define CONFIG_FORCE_CONSOLE_RESUME
diff --git a/board/reef/board.h b/board/reef/board.h
index 1a003d698b..3afcc77907 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -113,7 +113,6 @@
/* EC */
#define CONFIG_ADC
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_EXTPOWER_GPIO
#undef CONFIG_EXTPOWER_DEBOUNCE_MS
#define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h
index 3a2668e609..20d18ae3bf 100644
--- a/board/reef_it8320/board.h
+++ b/board/reef_it8320/board.h
@@ -110,7 +110,6 @@
/* EC */
#define CONFIG_ADC
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_EXTPOWER_GPIO
#undef CONFIG_EXTPOWER_DEBOUNCE_MS
#define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index a512f8551d..b12c4e5d71 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -115,7 +115,6 @@
/* EC */
#define CONFIG_ADC
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_EXTPOWER_GPIO
#undef CONFIG_EXTPOWER_DEBOUNCE_MS
#define CONFIG_EXTPOWER_DEBOUNCE_MS 1000
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index 6d179dfa7c..345bf1a96f 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -48,7 +48,6 @@
/* Optional features */
#define CONFIG_BOARD_PRE_INIT
-#define CONFIG_BOARD_VERSION_CUSTOM
#define CONFIG_BUTTON_TRIGGERED_RECOVERY
#define CONFIG_CHARGER_ILIM_PIN_DISABLED
#define CONFIG_FORCE_CONSOLE_RESUME
diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h
index 9a0973fe41..9ff102978c 100644
--- a/board/servo_v4/board.h
+++ b/board/servo_v4/board.h
@@ -17,7 +17,6 @@
* id from previous versions.
*/
#define BOARD_VERSION_BLACK 3
-#define CONFIG_BOARD_VERSION_CUSTOM
/* 48 MHz SYSCLK clock frequency */
#define CPU_CLOCK 48000000
diff --git a/board/servo_v4p1/board.h b/board/servo_v4p1/board.h
index b28f18a60a..2462abb081 100644
--- a/board/servo_v4p1/board.h
+++ b/board/servo_v4p1/board.h
@@ -11,8 +11,6 @@
/* Use Link-Time Optimizations to try to reduce the firmware code size */
#define CONFIG_LTO
-#define CONFIG_BOARD_VERSION_CUSTOM
-
/* 48 MHz SYSCLK clock frequency */
#define CPU_CLOCK 48000000
View Lorry Controller Status