summaryrefslogtreecommitdiff
path: root/baseboard
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@google.com>2021-06-07 12:11:03 -0700
committerCommit Bot <commit-bot@chromium.org>2021-06-16 03:38:00 +0000
commit8b76bbe2f5a162f21cc78fdafd49225e28a1cc02 (patch)
tree53e19b3e3420f6929bd148c283c6454ceda37797 /baseboard
parent9f540598b57f5305e13b1f9cccad21bad0fb7f4e (diff)
downloadchrome-ec-8b76bbe2f5a162f21cc78fdafd49225e28a1cc02.tar.gz
config: Rename CONFIG_CROS_BOARD_INFO
Rename CONFIG_CROS_BOARD_INFO to CONFIG_CBI_EEPROM to make it clear that the information comes from on-board EEPROM. It sets up the groundwork for adding more options of CBI sources later. BRANCH=None BUG=b:186264627 TEST=make buildall -j Signed-off-by: Philip Chen <philipchen@google.com> Change-Id: I9a6feee0a8b35bbf29e445544243485507767ad8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2945792 Reviewed-by: Philip Chen <philipchen@chromium.org> Commit-Queue: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org>
Diffstat (limited to 'baseboard')
-rw-r--r--baseboard/brya/baseboard.h2
-rw-r--r--baseboard/cherry/baseboard.h2
-rw-r--r--baseboard/dedede/baseboard.h2
-rw-r--r--baseboard/dragonegg/baseboard.h2
-rw-r--r--baseboard/grunt/baseboard.c2
-rw-r--r--baseboard/guybrush/baseboard.h2
-rw-r--r--baseboard/guybrush/build.mk2
-rw-r--r--baseboard/hatch/baseboard.h2
-rw-r--r--baseboard/honeybuns/baseboard.h2
-rw-r--r--baseboard/kalista/baseboard.h2
-rw-r--r--baseboard/mancomb/baseboard.h2
-rw-r--r--baseboard/mancomb/build.mk2
-rw-r--r--baseboard/octopus/baseboard.h2
-rw-r--r--baseboard/volteer/baseboard.h2
-rw-r--r--baseboard/zork/baseboard.h2
15 files changed, 15 insertions, 15 deletions
diff --git a/baseboard/brya/baseboard.h b/baseboard/brya/baseboard.h
index 636c81b67c..6ebc5b06e7 100644
--- a/baseboard/brya/baseboard.h
+++ b/baseboard/brya/baseboard.h
@@ -24,7 +24,7 @@
/* EC Defines */
#define CONFIG_LTO
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_BOARD_VERSION_CBI
#define CONFIG_CRC8
#define CONFIG_FPU
diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h
index 0984d2e0dd..b1673c8490 100644
--- a/baseboard/cherry/baseboard.h
+++ b/baseboard/cherry/baseboard.h
@@ -54,7 +54,7 @@
/* CBI */
#define CONFIG_BOARD_VERSION_CBI
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_CMD_CBI
#define I2C_PORT_EEPROM IT83XX_I2C_CH_A
#define I2C_ADDR_EEPROM_FLAGS 0x50
diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h
index f7cbfcac31..933512548b 100644
--- a/baseboard/dedede/baseboard.h
+++ b/baseboard/dedede/baseboard.h
@@ -141,7 +141,7 @@
#define CONFIG_WP_ACTIVE_HIGH
/* CBI */
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_BOARD_VERSION_CBI
/* Charger */
diff --git a/baseboard/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h
index ce8122c4e3..60b2d07241 100644
--- a/baseboard/dragonegg/baseboard.h
+++ b/baseboard/dragonegg/baseboard.h
@@ -39,7 +39,7 @@
* version. But for P0/P1 boards rely on GPIO signals.
*/
/* #define CONFIG_BOARD_VERSION_CBI */
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_CRC8
/* Common Keyboard Defines */
diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c
index ffd084c37a..d5761768e0 100644
--- a/baseboard/grunt/baseboard.c
+++ b/baseboard/grunt/baseboard.c
@@ -724,7 +724,7 @@ static void cbi_init(void)
* Use board version and SKU ID from CBI EEPROM if the board supports
* it and the SKU ID set via resistors + ADC is not valid.
*/
-#ifdef CONFIG_CROS_BOARD_INFO
+#ifdef CONFIG_CBI_EEPROM
if (sku_id == 0 || sku_id == 0xff) {
uint32_t val;
diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h
index d066a2f7da..016d36b503 100644
--- a/baseboard/guybrush/baseboard.h
+++ b/baseboard/guybrush/baseboard.h
@@ -32,7 +32,7 @@
#define GPIO_PACKET_MODE_EN GPIO_EC_GSC_PACKET_MODE
/* CBI Config */
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_BOARD_VERSION_CBI
/* Power Config */
diff --git a/baseboard/guybrush/build.mk b/baseboard/guybrush/build.mk
index d6849d3029..976ff2c931 100644
--- a/baseboard/guybrush/build.mk
+++ b/baseboard/guybrush/build.mk
@@ -12,4 +12,4 @@ CHIP_VARIANT:=npcx9m3f
baseboard-y=baseboard.o
baseboard-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o
-baseboard-$(CONFIG_CROS_BOARD_INFO)+=cbi.o \ No newline at end of file
+baseboard-$(CONFIG_CBI_EEPROM)+=cbi.o \ No newline at end of file
diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h
index e16872ed3a..2cbe91221f 100644
--- a/baseboard/hatch/baseboard.h
+++ b/baseboard/hatch/baseboard.h
@@ -35,7 +35,7 @@
#define CONFIG_ADC
#define CONFIG_BOARD_VERSION_CBI
#define CONFIG_CRC8
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_DPTF
#define CONFIG_HIBERNATE_PSL
#define CONFIG_LED_ONOFF_STATES
diff --git a/baseboard/honeybuns/baseboard.h b/baseboard/honeybuns/baseboard.h
index 401f2f59d0..137f6b5df4 100644
--- a/baseboard/honeybuns/baseboard.h
+++ b/baseboard/honeybuns/baseboard.h
@@ -81,7 +81,7 @@
/* CBI Configs */
#define I2C_ADDR_EEPROM_FLAGS 0x50
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_BOARD_VERSION_CBI
#define CONFIG_CMD_CBI
#define CBI_FW_MF_MASK BIT(0)
diff --git a/baseboard/kalista/baseboard.h b/baseboard/kalista/baseboard.h
index abccbfe528..230b815a48 100644
--- a/baseboard/kalista/baseboard.h
+++ b/baseboard/kalista/baseboard.h
@@ -21,7 +21,7 @@
#define CONFIG_BOARD_HAS_RTC_RESET
#define CONFIG_CRC8
#define CONFIG_CEC
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_DEDICATED_RECOVERY_BUTTON
#define CONFIG_EMULATED_SYSRQ
#define CONFIG_LED_COMMON
diff --git a/baseboard/mancomb/baseboard.h b/baseboard/mancomb/baseboard.h
index 5c50ccbcee..4a6fd102dc 100644
--- a/baseboard/mancomb/baseboard.h
+++ b/baseboard/mancomb/baseboard.h
@@ -31,7 +31,7 @@
#define GPIO_PACKET_MODE_EN GPIO_EC_GSC_PACKET_MODE
/* CBI Config */
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_BOARD_VERSION_CBI
/* Undefs because Box */
diff --git a/baseboard/mancomb/build.mk b/baseboard/mancomb/build.mk
index d8adda45d6..391bd70ab2 100644
--- a/baseboard/mancomb/build.mk
+++ b/baseboard/mancomb/build.mk
@@ -12,4 +12,4 @@ CHIP_VARIANT:=npcx9m3f
baseboard-y=baseboard.o
baseboard-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o
-baseboard-$(CONFIG_CROS_BOARD_INFO)+=cbi.o \ No newline at end of file
+baseboard-$(CONFIG_CBI_EEPROM)+=cbi.o \ No newline at end of file
diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h
index c729b84bf8..e07fa9166e 100644
--- a/baseboard/octopus/baseboard.h
+++ b/baseboard/octopus/baseboard.h
@@ -81,7 +81,7 @@
#define CONFIG_VSTORE
#define CONFIG_VSTORE_SLOT_COUNT 1
#define CONFIG_CRC8
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_BOARD_VERSION_CBI
#define CONFIG_LOW_POWER_IDLE
#define CONFIG_DPTF
diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h
index 53cfa7b95f..b3bb89f91d 100644
--- a/baseboard/volteer/baseboard.h
+++ b/baseboard/volteer/baseboard.h
@@ -30,7 +30,7 @@
#define CONFIG_LTO
#define CONFIG_BOARD_VERSION_CBI
#define CONFIG_CRC8
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_DPTF
#define CONFIG_FPU
#define CONFIG_HIBERNATE_PSL
diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h
index 292d50722a..ea1e19945d 100644
--- a/baseboard/zork/baseboard.h
+++ b/baseboard/zork/baseboard.h
@@ -53,7 +53,7 @@
#define CONFIG_VOLUME_BUTTONS
/* CBI EEPROM for board version and SKU ID */
-#define CONFIG_CROS_BOARD_INFO
+#define CONFIG_CBI_EEPROM
#define CONFIG_BOARD_VERSION_CBI
#define CONFIG_CRC8
View Lorry Controller Status