diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-10-12 19:41:08 -0500 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-03 23:05:31 +0000 |
| commit | 736abf79d18e0dd043eb80b34c5e20b17919627e (patch) | |
| tree | 211ae16e44cf599cbb9a765c388aa90b64d69560 | |
| parent | 4c55e585b7eb37cf1f113c82f97458f570cab4a0 (diff) | |
| download | chrome-ec-736abf79d18e0dd043eb80b34c5e20b17919627e.tar.gz | |
ccdblock: move IGNORE_SERVO warning to the end
Move the IGNORE_SERVO warning to the end of ccdblock output, so it
doesn't break up the ports blocked.
BUG=none
TEST=enable ccdblock EC_CR50_COMM and IGNORE_SERVO. Verify EC_CR50_COMM
shows up in the port blocked field.
> ccdblock
CCD ports blocked: EC_CR50_COMM IGNORE_SERVO
WARNING: enabling UART while servo is connected may damage hardware
Change-Id: I423f05d3d4c097c2e2fc2fd6db83a8d1f6b410a0
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3219761
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
(cherry picked from commit 27d99037218b794324d5731591dafa8ab5209c92)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3229793
Reviewed-by: Andrey Pronin <apronin@chromium.org>
(cherry picked from commit 742146c5d12c96e09f2dd2e44e58d099ec5643b7)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3260176
| -rw-r--r-- | board/cr50/rdd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/cr50/rdd.c b/board/cr50/rdd.c index e7727c3ac8..e6d4222054 100644 --- a/board/cr50/rdd.c +++ b/board/cr50/rdd.c @@ -456,15 +456,15 @@ static void print_ccd_ports_blocked(void) ccputs(" EC"); if (ccd_block & CCD_BLOCK_SERVO_SHARED) ccputs(" SERVO"); + if (ccd_block & CCD_BLOCK_EC_CR50_COMM) + ccputs(" EC_CR50_COMM"); + if (ccd_block & CCD_BLOCK_TRISTATE_EC) + ccputs(" TRISTATE_EC"); if (ccd_block & CCD_BLOCK_IGNORE_SERVO) { ccputs(" IGNORE_SERVO"); ccputs("\nWARNING: enabling UART while servo is connected may " "damage hardware"); } - if (ccd_block & CCD_BLOCK_EC_CR50_COMM) - ccputs(" EC_CR50_COMM"); - if (ccd_block & CCD_BLOCK_TRISTATE_EC) - ccputs(" TRISTATE_EC"); if (!ccd_block) ccputs(" (none)"); ccputs("\n"); |