summaryrefslogtreecommitdiff
path: root/lib/trace.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-04-08 13:20:52 -0600
committerSimon Glass <sjg@chromium.org>2019-04-23 20:26:43 -0600
commit1c6eb075a3fd31f3a22d72f11abc0b15c5776f1d (patch)
treeea33cd206a5b8280b6a35afe790410d46ecf42c4 /lib/trace.c
parenta24a78d7e3e8b6008423d1a6aa49a6c9eb904752 (diff)
Convert CONFIG_TRACE_BUFFER_SIZE et al to Kconfig
This converts the following to Kconfig: CONFIG_TRACE_BUFFER_SIZE CONFIG_TRACE_EARLY_SIZE CONFIG_TRACE_EARLY CONFIG_TRACE_EARLY_ADDR Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib/trace.c')
-rw-r--r--lib/trace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/trace.c b/lib/trace.c
index fb7658b112..9956442fef 100644
--- a/lib/trace.c
+++ b/lib/trace.c
@@ -296,7 +296,8 @@ int __attribute__((no_instrument_function)) trace_init(void *buff,
trace_enabled = 0;
hdr = map_sysmem(CONFIG_TRACE_EARLY_ADDR,
CONFIG_TRACE_EARLY_SIZE);
- end = (char *)&hdr->ftrace[hdr->ftrace_count];
+ end = (char *)&hdr->ftrace[min(hdr->ftrace_count,
+ hdr->ftrace_size)];
used = end - (char *)hdr;
printf("trace: copying %08lx bytes of early data from %x to %08lx\n",
used, CONFIG_TRACE_EARLY_ADDR,