summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDino Li <Dino.Li@ite.com.tw>2021-02-22 14:17:02 +0800
committerCommit Bot <commit-bot@chromium.org>2021-02-23 09:53:41 +0000
commit0a32e6fdfd8e24a8f3d512bec9b30fa0bcae6c44 (patch)
treebb10c934ee10a850b41bc0a43d550df15d3e07b8
parent4606b088189b90bbfe3c6b0b71955fc1a58b06ec (diff)
downloadchrome-ec-0a32e6fdfd8e24a8f3d512bec9b30fa0bcae6c44.tar.gz
baseboard/kukui: add support for EC variant
With this change, we are able to build baseboard/kukui/baseboard.c on other chips. BUG=none BRANCH=none TEST=buildall. Signed-off-by: Dino Li <Dino.Li@ite.com.tw> Change-Id: I209daaa991f021fb7c33c21c28a7be30203510bc Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2710131 Reviewed-by: Ting Shen <phoenixshen@chromium.org> Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Diffstat
-rw-r--r--baseboard/kukui/baseboard.c6
-rw-r--r--baseboard/kukui/baseboard.h13
-rw-r--r--board/burnet/board.h1
-rw-r--r--board/cerise/board.h1
-rw-r--r--board/damu/board.h1
-rw-r--r--board/fennel/board.h1
-rw-r--r--board/jacuzzi/board.h1
-rw-r--r--board/kakadu/board.h1
-rw-r--r--board/kappa/board.h1
-rw-r--r--board/katsu/board.h1
-rw-r--r--board/kodama/board.h1
-rw-r--r--board/kukui/board.h1
-rw-r--r--board/stern/board.h1
-rw-r--r--board/willow/board.h1
14 files changed, 31 insertions, 0 deletions
diff --git a/baseboard/kukui/baseboard.c b/baseboard/kukui/baseboard.c
index b53260b187..ed5a0974d2 100644
--- a/baseboard/kukui/baseboard.c
+++ b/baseboard/kukui/baseboard.c
@@ -43,6 +43,7 @@ void board_reset_pd_mcu(void)
void board_config_pre_init(void)
{
+#ifdef VARIANT_KUKUI_EC_STM32F098
STM32_RCC_AHBENR |= STM32_RCC_HB_DMA1;
/*
* Remap USART1 and SPI2 DMA:
@@ -52,6 +53,7 @@ void board_config_pre_init(void)
*/
STM32_DMA_CSELR(STM32_DMAC_CH4) = (8 << 12) | (8 << 16) |
(3 << 20) | (3 << 24);
+#endif
}
enum kukui_board_version {
@@ -124,6 +126,7 @@ int board_get_version(void)
}
}
+#ifdef VARIANT_KUKUI_EC_STM32F098
/*
* For devices without pogo, Disable ADC module after we detect the
* board version, since this is the only thing ADC module needs to do
@@ -132,15 +135,18 @@ int board_get_version(void)
if (CONFIG_DEDICATED_CHARGE_PORT_COUNT == 0 &&
version != BOARD_VERSION_UNKNOWN)
adc_disable();
+#endif
return version;
}
static void baseboard_spi_init(void)
{
+#ifdef VARIANT_KUKUI_EC_STM32F098
/* Set SPI PA15,PB3/4/5/13/14/15 pins to high speed */
STM32_GPIO_OSPEEDR(GPIO_A) |= 0xc0000000;
STM32_GPIO_OSPEEDR(GPIO_B) |= 0xfc000fc0;
+#endif
}
DECLARE_HOOK(HOOK_INIT, baseboard_spi_init, HOOK_PRIO_INIT_SPI + 1);
diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h
index ebcf429d17..a0b5130ede 100644
--- a/baseboard/kukui/baseboard.h
+++ b/baseboard/kukui/baseboard.h
@@ -298,6 +298,19 @@
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
+/*
+ * Variant EC defines. Pick one:
+ * VARIANT_KUKUI_EC_STM32F098
+ * VARIANT_KUKUI_EC_IT81202
+ */
+#if defined(VARIANT_KUKUI_EC_STM32F098)
+/* TODO: Pull stm32 chip-specific config options to here. */
+#elif defined(VARIANT_KUKUI_EC_IT81202)
+/* TODO: Put it83xx chip-specific config options here. */
+#else
+#error "Must define a VARIANT_KUKUI_EC_XXX!"
+#endif
+
#ifndef __ASSEMBLER__
#ifdef VARIANT_KUKUI_DP_MUX_GPIO
void board_set_dp_mux_control(int output_enable, int polarity);
diff --git a/board/burnet/board.h b/board/burnet/board.h
index c8311d363f..9dd115ba50 100644
--- a/board/burnet/board.h
+++ b/board/burnet/board.h
@@ -11,6 +11,7 @@
#define VARIANT_KUKUI_JACUZZI
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_ISL9238
+#define VARIANT_KUKUI_EC_STM32F098
#ifndef SECTION_IS_RW
#define VARIANT_KUKUI_NO_SENSORS
diff --git a/board/cerise/board.h b/board/cerise/board.h
index 73d04f6bcf..97fe823454 100644
--- a/board/cerise/board.h
+++ b/board/cerise/board.h
@@ -11,6 +11,7 @@
#define VARIANT_KUKUI_JACUZZI
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_ISL9238
+#define VARIANT_KUKUI_EC_STM32F098
#ifndef SECTION_IS_RW
#define VARIANT_KUKUI_NO_SENSORS
diff --git a/board/damu/board.h b/board/damu/board.h
index e5de9c205c..c7c798a308 100644
--- a/board/damu/board.h
+++ b/board/damu/board.h
@@ -11,6 +11,7 @@
#define VARIANT_KUKUI_JACUZZI
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_ISL9238
+#define VARIANT_KUKUI_EC_STM32F098
#ifndef SECTION_IS_RW
#define VARIANT_KUKUI_NO_SENSORS
diff --git a/board/fennel/board.h b/board/fennel/board.h
index 3995435de1..169d27202d 100644
--- a/board/fennel/board.h
+++ b/board/fennel/board.h
@@ -11,6 +11,7 @@
#define VARIANT_KUKUI_JACUZZI
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_ISL9238
+#define VARIANT_KUKUI_EC_STM32F098
#ifndef SECTION_IS_RW
#define VARIANT_KUKUI_NO_SENSORS
diff --git a/board/jacuzzi/board.h b/board/jacuzzi/board.h
index 57a33d7293..dbb84a1aa4 100644
--- a/board/jacuzzi/board.h
+++ b/board/jacuzzi/board.h
@@ -11,6 +11,7 @@
#define VARIANT_KUKUI_JACUZZI
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_ISL9238
+#define VARIANT_KUKUI_EC_STM32F098
#ifndef SECTION_IS_RW
#define VARIANT_KUKUI_NO_SENSORS
diff --git a/board/kakadu/board.h b/board/kakadu/board.h
index f2c0c4141c..69ef8d0217 100644
--- a/board/kakadu/board.h
+++ b/board/kakadu/board.h
@@ -13,6 +13,7 @@
#define VARIANT_KUKUI_POGO_KEYBOARD
#define VARIANT_KUKUI_CHARGER_MT6370
+#define VARIANT_KUKUI_EC_STM32F098
#define VARIANT_KUKUI_TABLET_PWRBTN
#ifndef SECTION_IS_RW
diff --git a/board/kappa/board.h b/board/kappa/board.h
index 81ac819cf9..e6eb66f72f 100644
--- a/board/kappa/board.h
+++ b/board/kappa/board.h
@@ -11,6 +11,7 @@
#define VARIANT_KUKUI_JACUZZI
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_ISL9238
+#define VARIANT_KUKUI_EC_STM32F098
#ifndef SECTION_IS_RW
#define VARIANT_KUKUI_NO_SENSORS
diff --git a/board/katsu/board.h b/board/katsu/board.h
index 99f576b727..6cbd2b4073 100644
--- a/board/katsu/board.h
+++ b/board/katsu/board.h
@@ -13,6 +13,7 @@
#define VARIANT_KUKUI_POGO_KEYBOARD
#define VARIANT_KUKUI_CHARGER_MT6370
+#define VARIANT_KUKUI_EC_STM32F098
#define VARIANT_KUKUI_TABLET_PWRBTN
#ifndef SECTION_IS_RW
diff --git a/board/kodama/board.h b/board/kodama/board.h
index cf71fe5dd2..9bd2254d78 100644
--- a/board/kodama/board.h
+++ b/board/kodama/board.h
@@ -10,6 +10,7 @@
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_MT6370
+#define VARIANT_KUKUI_EC_STM32F098
#define VARIANT_KUKUI_POGO_KEYBOARD
#define VARIANT_KUKUI_TABLET_PWRBTN
diff --git a/board/kukui/board.h b/board/kukui/board.h
index e78fdc6ac3..bbd13c18bf 100644
--- a/board/kukui/board.h
+++ b/board/kukui/board.h
@@ -16,6 +16,7 @@
#endif
#define VARIANT_KUKUI_CHARGER_MT6370
+#define VARIANT_KUKUI_EC_STM32F098
#define VARIANT_KUKUI_DP_MUX_GPIO
#define VARIANT_KUKUI_TABLET_PWRBTN
diff --git a/board/stern/board.h b/board/stern/board.h
index 1ee3d931eb..72b5814236 100644
--- a/board/stern/board.h
+++ b/board/stern/board.h
@@ -11,6 +11,7 @@
#define VARIANT_KUKUI_JACUZZI
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_ISL9238
+#define VARIANT_KUKUI_EC_STM32F098
#ifndef SECTION_IS_RW
#define VARIANT_KUKUI_NO_SENSORS
diff --git a/board/willow/board.h b/board/willow/board.h
index 73f6c19b5f..0fa3bf8c00 100644
--- a/board/willow/board.h
+++ b/board/willow/board.h
@@ -11,6 +11,7 @@
#define VARIANT_KUKUI_JACUZZI
#define VARIANT_KUKUI_BATTERY_SMART
#define VARIANT_KUKUI_CHARGER_ISL9238
+#define VARIANT_KUKUI_EC_STM32F098
#ifndef SECTION_IS_RW
#define VARIANT_KUKUI_NO_SENSORS
View Lorry Controller Status