summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoanna Farley <joanna.farley@arm.com>2023-10-17 15:22:54 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2023-10-17 15:22:54 +0200
commit159ebbfe801e294483bf22cb80f6b6724cf400e0 (patch)
treea1d9add7fad79e8bee8abec475f41edcf7bfbeb0
parent7bcd3cf5572a1fa4db65f3fc2f4b01fe3c6709c1 (diff)
parentc6d9186f60a08b4a44b1ecf38071eacdc9553ef6 (diff)
Merge changes from topic "dcc-console" into integration
* changes: fix(dcc): enable DCC also for crash console build(changelog): add new scope for DCC
-rw-r--r--changelog.yaml3
-rw-r--r--drivers/arm/dcc/dcc_console.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/changelog.yaml b/changelog.yaml
index 2d6986b77..33e5e8c64 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -609,6 +609,9 @@ subsections:
- plat/xilinx
subsections:
+ - title: DCC (Debug Communication Channel)
+ scope: dcc
+
- title: Versal
scope: versal
diff --git a/drivers/arm/dcc/dcc_console.c b/drivers/arm/dcc/dcc_console.c
index d8f9462ae..19c3450b3 100644
--- a/drivers/arm/dcc/dcc_console.c
+++ b/drivers/arm/dcc/dcc_console.c
@@ -137,7 +137,8 @@ static void dcc_console_flush(struct console *console)
static struct dcc_console dcc_console = {
.console = {
.flags = CONSOLE_FLAG_BOOT |
- CONSOLE_FLAG_RUNTIME,
+ CONSOLE_FLAG_RUNTIME |
+ CONSOLE_FLAG_CRASH,
.putc = dcc_console_putc,
#if ENABLE_CONSOLE_GETC
.getc = dcc_console_getc,