summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Chao <scott_chao@wistron.corp-partner.google.com>2021-06-04 08:58:04 +0800
committerCommit Bot <commit-bot@chromium.org>2021-06-10 01:32:40 +0000
commitc159c29657a2e1fa005bb60ccb3b5c5eb7294421 (patch)
treecdeedb8dcbe825fdfe8730ed289822880c523ab6
parent59ee738db62afccd4677e64844105c2410e330a1 (diff)
downloadchrome-ec-c159c29657a2e1fa005bb60ccb3b5c5eb7294421.tar.gz
primus: replace board name to "primus"
BUG=b:190567710 BRANCH=None TEST=make BOARD=primus Signed-off-by: Scott Chao <scott_chao@wistron.corp-partner.google.com> Change-Id: I2d430eb20689ffd8df5e370d0ff810da2669efea Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2939162 Reviewed-by: Boris Mittelberg <bmbm@google.com>
-rw-r--r--board/primus/battery.c2
-rw-r--r--board/primus/board.h7
-rw-r--r--board/primus/build.mk2
-rw-r--r--board/primus/fw_config.c10
-rw-r--r--board/primus/fw_config.h14
-rw-r--r--board/primus/led.c2
-rw-r--r--board/primus/tune_mp2964.c2
-rw-r--r--board/primus/usbc_config.h2
8 files changed, 20 insertions, 21 deletions
diff --git a/board/primus/battery.c b/board/primus/battery.c
index 91ecfe0583..c3987aad65 100644
--- a/board/primus/battery.c
+++ b/board/primus/battery.c
@@ -10,7 +10,7 @@
#include "util.h"
/*
- * Battery info for all Brya battery types. Note that the fields
+ * Battery info for all Primus battery types. Note that the fields
* start_charging_min/max and charging_min/max are not used for the charger.
* The effective temperature limits are given by discharging_min/max_c.
*
diff --git a/board/primus/board.h b/board/primus/board.h
index fd9bd7bf54..ae8f38c2af 100644
--- a/board/primus/board.h
+++ b/board/primus/board.h
@@ -3,13 +3,13 @@
* found in the LICENSE file.
*/
-/* Brya board configuration */
+/* Primus board configuration */
#ifndef __CROS_EC_BOARD_H
#define __CROS_EC_BOARD_H
/*
- * Early brya boards are not set up for vivaldi
+ * Early primus boards are not set up for vivaldi
*/
#undef CONFIG_KEYBOARD_VIVALDI
@@ -57,7 +57,6 @@
#define CONFIG_USBC_PPC_SYV682X
#define CONFIG_USBC_PPC_NX20P3483
-/* TODO: b/177608416 - measure and check these values on brya */
#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */
#define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */
#define PD_VCONN_SWAP_DELAY 5000 /* us */
@@ -154,7 +153,7 @@
#define CONFIG_STEINHART_HART_3V3_30K9_47K_4050B
/*
- * TODO(b/181271666): no fan control loop until sensors are tuned
+ * TODO: no fan control loop until sensors are tuned
*/
/* #define CONFIG_FANS FAN_CH_COUNT */
diff --git a/board/primus/build.mk b/board/primus/build.mk
index 78fee4583b..b75a75e6a6 100644
--- a/board/primus/build.mk
+++ b/board/primus/build.mk
@@ -3,7 +3,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
-# Brya board specific files build
+# Primus board specific files build
#
CHIP:=npcx
diff --git a/board/primus/fw_config.c b/board/primus/fw_config.c
index 2d9ee6de25..99b94ecb82 100644
--- a/board/primus/fw_config.c
+++ b/board/primus/fw_config.c
@@ -10,20 +10,20 @@
#define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args)
-static union brya_cbi_fw_config fw_config;
+static union primus_cbi_fw_config fw_config;
BUILD_ASSERT(sizeof(fw_config) == sizeof(uint32_t));
/*
- * FW_CONFIG defaults for brya if the CBI.FW_CONFIG data is not
+ * FW_CONFIG defaults for primus if the CBI.FW_CONFIG data is not
* initialized.
*/
-static const union brya_cbi_fw_config fw_config_defaults = {
+static const union primus_cbi_fw_config fw_config_defaults = {
.usb_db = DB_USB3_PS8815,
.kb_bl = KEYBOARD_BACKLIGHT_ENABLED,
};
/****************************************************************************
- * Brya FW_CONFIG access
+ * Primus FW_CONFIG access
*/
void board_init_fw_config(void)
{
@@ -48,7 +48,7 @@ void board_init_fw_config(void)
}
}
-union brya_cbi_fw_config get_fw_config(void)
+union primus_cbi_fw_config get_fw_config(void)
{
return fw_config;
}
diff --git a/board/primus/fw_config.h b/board/primus/fw_config.h
index 31843e759e..8e395c72a1 100644
--- a/board/primus/fw_config.h
+++ b/board/primus/fw_config.h
@@ -3,15 +3,15 @@
* found in the LICENSE file.
*/
-#ifndef __BOARD_BRYA_FW_CONFIG_H_
-#define __BOARD_BRYA_FW_CONFIG_H_
+#ifndef __BOARD_PRIMUS_FW_CONFIG_H_
+#define __BOARD_PRIMUS_FW_CONFIG_H_
#include "stdint.h"
/****************************************************************************
- * CBI FW_CONFIG layout for Brya board.
+ * CBI FW_CONFIG layout for Primus board.
*
- * Source of truth is the project/brya/brya/config.star configuration file.
+ * Source of truth is the project/brya/primus/config.star configuration file.
*/
enum ec_cfg_usb_db_type {
@@ -25,7 +25,7 @@ enum ec_cfg_keyboard_backlight_type {
KEYBOARD_BACKLIGHT_ENABLED = 1
};
-union brya_cbi_fw_config {
+union primus_cbi_fw_config {
struct {
enum ec_cfg_usb_db_type usb_db : 4;
uint32_t sd_db : 2;
@@ -42,7 +42,7 @@ union brya_cbi_fw_config {
*
* @return the FW_CONFIG for the board.
*/
-union brya_cbi_fw_config get_fw_config(void);
+union primus_cbi_fw_config get_fw_config(void);
/**
* Get the USB daughter board type from FW_CONFIG.
@@ -51,4 +51,4 @@ union brya_cbi_fw_config get_fw_config(void);
*/
enum ec_cfg_usb_db_type ec_cfg_usb_db_type(void);
-#endif /* __BOARD_BRYA_FW_CONFIG_H_ */
+#endif /* __BOARD_PRIMUS_FW_CONFIG_H_ */
diff --git a/board/primus/led.c b/board/primus/led.c
index 09f815efc2..f9c31ee9a1 100644
--- a/board/primus/led.c
+++ b/board/primus/led.c
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* Waddledoo specific PWM LED settings. */
+/* Primus specific PWM LED settings. */
#include "common.h"
#include "ec_commands.h"
diff --git a/board/primus/tune_mp2964.c b/board/primus/tune_mp2964.c
index c95f06d7fd..2d37d4ee61 100644
--- a/board/primus/tune_mp2964.c
+++ b/board/primus/tune_mp2964.c
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* Tune the MP2964 IMVP9.1 parameters for brya */
+/* Tune the MP2964 IMVP9.1 parameters for primus */
#include "console.h"
#include "hooks.h"
diff --git a/board/primus/usbc_config.h b/board/primus/usbc_config.h
index 5d08a446fb..a3dcf48fc6 100644
--- a/board/primus/usbc_config.h
+++ b/board/primus/usbc_config.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* Brya board-specific USB-C configuration */
+/* Primus board-specific USB-C configuration */
#ifndef __CROS_EC_USBC_CONFIG_H
#define __CROS_EC_USBC_CONFIG_H