diff options
| author | Tom Rini <[email protected]> | 2023-07-08 11:28:39 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-07-08 11:28:39 -0400 |
| commit | fa1e124ee77a6074df5abdf32c91da83df2c3d30 (patch) | |
| tree | 169b2d6887f6b9bd613b7d372cb241d78feb5a78 /common | |
| parent | 56c7fac8ad89955d3e5d08864bbd1343a058bf4b (diff) | |
| parent | 99a0532a2d09edac8d8cf59deb68e03f3275e494 (diff) | |
Merge branch '2023-07-07-assorted-build-improvements' into next
- Correct a few dependencies in Kconfig and better handle some generated
files so that they are properly cleaned later.
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 1 | ||||
| -rw-r--r-- | common/spl/Kconfig.tpl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/common/Kconfig b/common/Kconfig index bbabadb35e1..42baca20a61 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -256,6 +256,7 @@ config SYS_CONSOLE_OVERWRITE_ROUTINE config SYS_CONSOLE_ENV_OVERWRITE bool "Update environment variables during console init" + depends on SYS_CONSOLE_IS_IN_ENV help The console environment variables (stdout, stdin, stderr) can be used to determine the correct console devices on start-up. This diff --git a/common/spl/Kconfig.tpl b/common/spl/Kconfig.tpl index 1874f9db4f9..3d6cf1e59f3 100644 --- a/common/spl/Kconfig.tpl +++ b/common/spl/Kconfig.tpl @@ -43,6 +43,7 @@ config TPL_FRAMEWORK config TPL_BANNER_PRINT bool "Enable output of the TPL banner 'U-Boot TPL ...'" + depends on DEBUG_UART && TPL_SERIAL default y help If this option is enabled, TPL will print the banner with version |