summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2017-09-07 14:44:55 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-09-09 02:26:16 -0700
commit5da63f4ea2c93e6b059d8c50ff01dbe53a13dec2 (patch)
treeae2417b2411abe87ef47d8b994ddc23ff288bccb /board
parent103108ec216e67a4937d9a51f7134d4923dd31f5 (diff)
downloadchrome-ec-5da63f4ea2c93e6b059d8c50ff01dbe53a13dec2.tar.gz
Treat SYSTEM_IMAGE_RW_B also as RW copy
SYSTEM_IMAGE_RW_B hasn't been globally treated as a RW copy. This change makes EC treat it also as a RW copy. BUG=none BRANCH=none TEST=make buildall Change-Id: Iae5a9090cdf30f980014daca44cdf8f2a65ea1f2 Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/656337 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/chell/board.c3
-rw-r--r--board/coral/board.c3
-rw-r--r--board/elm/board.c3
-rw-r--r--board/eve/board.c3
-rw-r--r--board/fizz/board.c3
-rw-r--r--board/glados/board.c3
-rw-r--r--board/glados_pd/board.c2
-rw-r--r--board/kahlee/board.c3
-rw-r--r--board/kevin/charge_ramp.c3
-rw-r--r--board/oak/board.c3
-rw-r--r--board/poppy/board.c3
-rw-r--r--board/reef/board.c3
-rw-r--r--board/reef_it8320/board.c3
-rw-r--r--board/rowan/board.c3
-rw-r--r--board/samus_pd/board.c5
-rw-r--r--board/zoombini/board.c3
16 files changed, 17 insertions, 32 deletions
diff --git a/board/chell/board.c b/board/chell/board.c
index 6637e56543..1d56ceb237 100644
--- a/board/chell/board.c
+++ b/board/chell/board.c
@@ -358,8 +358,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/coral/board.c b/board/coral/board.c
index a1ebd18e7b..c712a79711 100644
--- a/board/coral/board.c
+++ b/board/coral/board.c
@@ -674,8 +674,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return (supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/elm/board.c b/board/elm/board.c
index 2ec3e08de0..78989c7348 100644
--- a/board/elm/board.c
+++ b/board/elm/board.c
@@ -344,8 +344,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/eve/board.c b/board/eve/board.c
index 38926113bd..38d9102b89 100644
--- a/board/eve/board.c
+++ b/board/eve/board.c
@@ -547,8 +547,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return (supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/fizz/board.c b/board/fizz/board.c
index 842a75d1b0..9c810a772b 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -380,8 +380,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return (supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/glados/board.c b/board/glados/board.c
index 893d3c32db..3d626ff5e1 100644
--- a/board/glados/board.c
+++ b/board/glados/board.c
@@ -327,8 +327,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/glados_pd/board.c b/board/glados_pd/board.c
index ba46c59b78..f97845aa24 100644
--- a/board/glados_pd/board.c
+++ b/board/glados_pd/board.c
@@ -59,7 +59,7 @@ static void board_init(void)
/* Set PD MCU system status bits */
if (system_jumped_to_this_image())
pd_status_flags |= PD_STATUS_JUMPED_TO_IMAGE;
- if (system_get_image_copy() == SYSTEM_IMAGE_RW)
+ if (system_is_in_rw())
pd_status_flags |= PD_STATUS_IN_RW;
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
diff --git a/board/kahlee/board.c b/board/kahlee/board.c
index b825d9b124..ea2d0827ce 100644
--- a/board/kahlee/board.c
+++ b/board/kahlee/board.c
@@ -422,8 +422,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return (supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/kevin/charge_ramp.c b/board/kevin/charge_ramp.c
index 70f12da5a3..566caa6e10 100644
--- a/board/kevin/charge_ramp.c
+++ b/board/kevin/charge_ramp.c
@@ -19,8 +19,7 @@
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/oak/board.c b/board/oak/board.c
index 704c287c11..446edb56c5 100644
--- a/board/oak/board.c
+++ b/board/oak/board.c
@@ -326,8 +326,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/poppy/board.c b/board/poppy/board.c
index 2e3c3e33b7..0303da3fba 100644
--- a/board/poppy/board.c
+++ b/board/poppy/board.c
@@ -685,8 +685,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return (supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/reef/board.c b/board/reef/board.c
index 8abb856141..f71bba079a 100644
--- a/board/reef/board.c
+++ b/board/reef/board.c
@@ -657,8 +657,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return (supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/reef_it8320/board.c b/board/reef_it8320/board.c
index 101deb2baf..8e9f97ad58 100644
--- a/board/reef_it8320/board.c
+++ b/board/reef_it8320/board.c
@@ -432,8 +432,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return (supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/rowan/board.c b/board/rowan/board.c
index 957a0bde0d..132034f13f 100644
--- a/board/rowan/board.c
+++ b/board/rowan/board.c
@@ -358,8 +358,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma,
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c
index aa8e6537dc..f20afd7985 100644
--- a/board/samus_pd/board.c
+++ b/board/samus_pd/board.c
@@ -250,7 +250,7 @@ static void board_init(void)
/* Set PD MCU system status bits */
if (system_jumped_to_this_image())
pd_status_flags |= PD_STATUS_JUMPED_TO_IMAGE;
- if (system_get_image_copy() == SYSTEM_IMAGE_RW)
+ if (system_is_in_rw())
pd_status_flags |= PD_STATUS_IN_RW;
#ifdef CONFIG_PWM
@@ -369,8 +369,7 @@ int pd_is_max_request_allowed(void)
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
else
return supplier == CHARGE_SUPPLIER_BC12_DCP ||
diff --git a/board/zoombini/board.c b/board/zoombini/board.c
index 47fc04e149..05aaf91239 100644
--- a/board/zoombini/board.c
+++ b/board/zoombini/board.c
@@ -190,8 +190,7 @@ int board_get_ramp_current_limit(int supplier, int sup_curr)
int board_is_ramp_allowed(int supplier)
{
/* Don't allow ramping in RO when write protected. */
- if (system_get_image_copy() != SYSTEM_IMAGE_RW
- && system_is_locked())
+ if (!system_is_in_rw() && system_is_locked())
return 0;
/*
View Lorry Controller Status