diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-12 01:10:11 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-12 01:10:11 +0300 |
| commit | a9758ece08bceb60634145c2126582e5d282bd09 (patch) | |
| tree | b391039a3bc2aa8222a14b3e960541296d585878 /common | |
| parent | 68deea2308141c26707da44654b273d7b072ab0d (diff) | |
| parent | 7ea33579576d2bcd19df76bd8769e7ab3b4a169b (diff) | |
| download | u-boot-a9758ece08bceb60634145c2126582e5d282bd09.tar.xz | |
Merge tag 'dm-pull-9jul19-take2' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
- Sandbox improvements including .dts refactor
- Minor tracing and PCI improvements
- Various other minor fixes
- Conversion of patman, dtoc and binman to support Python 3
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 7 | ||||
| -rw-r--r-- | common/board_f.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/common/Kconfig b/common/Kconfig index af66496e75..4865a4dfc8 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -69,6 +69,13 @@ config SPL_BOOTSTAGE_RECORD_COUNT This is the size of the bootstage record list and is the maximum number of bootstage records that can be recorded. +config TPL_BOOTSTAGE_RECORD_COUNT + int "Number of boot stage records to store for TPL" + default 5 + help + This is the size of the bootstage record list and is the maximum + number of bootstage records that can be recorded. + config BOOTSTAGE_FDT bool "Store boot timing information in the OS device tree" depends on BOOTSTAGE diff --git a/common/board_f.c b/common/board_f.c index c25eb188fb..4760d728f3 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -442,8 +442,8 @@ static int reserve_trace(void) #ifdef CONFIG_TRACE gd->relocaddr -= CONFIG_TRACE_BUFFER_SIZE; gd->trace_buff = map_sysmem(gd->relocaddr, CONFIG_TRACE_BUFFER_SIZE); - debug("Reserving %dk for trace data at: %08lx\n", - CONFIG_TRACE_BUFFER_SIZE >> 10, gd->relocaddr); + debug("Reserving %luk for trace data at: %08lx\n", + (unsigned long)CONFIG_TRACE_BUFFER_SIZE >> 10, gd->relocaddr); #endif return 0; @@ -839,7 +839,7 @@ static const init_fnc_t init_sequence_f[] = { #ifdef CONFIG_OF_CONTROL fdtdec_setup, #endif -#ifdef CONFIG_TRACE +#ifdef CONFIG_TRACE_EARLY trace_early_init, #endif initf_malloc, |