summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-06-29 09:54:02 -0400
committerTom Rini <[email protected]>2022-06-29 10:11:21 -0400
commit5c873269fc374674e5e8aad65ab4ed45b1fe9f65 (patch)
tree5b2860d103a7f70abfd4534e10bdb53539cf18b5 /boot
parentd61c11b8c894fad517677dc51ee82d1eade39c01 (diff)
parent613c326581fd96b55dd21e3a6d23e844e896832b (diff)
Merge branch '2022-06-28-Kconfig-migrations' into next
- Convert a large number of CONFIG symbols to Kconfig. Of note is a large chunk of USB symbols (and dead code removal), ensuring all SPL/TPL/VPL symbols have an appropriate dependency, largely (but not entirely) removing the testing of CONFIG_SPL_BUILD in board headers, and allowing CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS to co-exist as this facilities migration of many platforms.
Diffstat (limited to 'boot')
-rw-r--r--boot/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot/Kconfig b/boot/Kconfig
index 08451c65a56..38fc71c6f79 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -622,7 +622,7 @@ config SPL_BOOTSTAGE
config TPL_BOOTSTAGE
bool "Boot timing and reported in TPL"
- depends on BOOTSTAGE
+ depends on BOOTSTAGE && TPL
help
Enable recording of boot time in SPL. To make this visible to U-Boot
proper, enable BOOTSTAGE_STASH as well. This will stash the timing