diff options
| author | Tom Rini <[email protected]> | 2021-03-03 22:53:53 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-03-03 22:53:53 -0500 |
| commit | 2b82b1d26ae44ac2f43d8a87f482fe906ba863fb (patch) | |
| tree | 34016a954bbcba79b78713790480b5072828d29b /common | |
| parent | 52ba373b7825e9feab8357065155cf43dfe2f4ff (diff) | |
| parent | 384b62c073f3aaccba0c917a8da7701a82441aec (diff) | |
Merge tag 'dm-pull-3mar21' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
dm: Fix an obscure bug with empty of-platdata
Fixes for ns16550 base address and frequency-reading
Other minor fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig.boot | 3 | ||||
| -rw-r--r-- | common/bootstage.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/common/Kconfig.boot b/common/Kconfig.boot index 70c02b9e30a..e650c605d1d 100644 --- a/common/Kconfig.boot +++ b/common/Kconfig.boot @@ -449,6 +449,7 @@ config BOOTSTAGE_REPORT config BOOTSTAGE_RECORD_COUNT int "Number of boot stage records to store" + depends on BOOTSTAGE default 30 help This is the size of the bootstage record list and is the maximum @@ -456,6 +457,7 @@ config BOOTSTAGE_RECORD_COUNT config SPL_BOOTSTAGE_RECORD_COUNT int "Number of boot stage records to store for SPL" + depends on SPL_BOOTSTAGE default 5 help This is the size of the bootstage record list and is the maximum @@ -463,6 +465,7 @@ config SPL_BOOTSTAGE_RECORD_COUNT config TPL_BOOTSTAGE_RECORD_COUNT int "Number of boot stage records to store for TPL" + depends on TPL_BOOTSTAGE default 5 help This is the size of the bootstage record list and is the maximum diff --git a/common/bootstage.c b/common/bootstage.c index d5b78b9f487..2c0110c2630 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -349,7 +349,7 @@ void bootstage_report(void) } if (data->rec_count > RECORD_COUNT) printf("Overflowed internal boot id table by %d entries\n" - "Please increase CONFIG_(SPL_)BOOTSTAGE_RECORD_COUNT\n", + "Please increase CONFIG_(SPL_TPL_)BOOTSTAGE_RECORD_COUNT\n", data->rec_count - RECORD_COUNT); puts("\nAccumulated time:\n"); |