On 10/07/23 20:36, Tom Rini wrote:
On Sun, Jul 09, 2023 at 07:18:10PM -0400, Samuel Dionne-Riel wrote:

Using `default y` will not select BMP when CMD_BMP has been enabled, if
it was already configured.

By using `select`, if `CMD_BMP` is turned on, it will force the presence
of `BMP`.

Fixes: 072b0e16c482114d242580dd7a3197db5966705f

The fixes tag should be the "git log -n1 --oneline" version of the
commit, btw.

Signed-off-by: Samuel Dionne-Riel <sam...@dionne-riel.com>
---
  cmd/Kconfig    | 1 +
  common/Kconfig | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 02e54f1e50..94c54b2359 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1988,6 +1988,7 @@ config CMD_2048
  config CMD_BMP
        bool "Enable 'bmp' command"
        depends on VIDEO
+       select BMP
        help
          This provides a way to obtain information about a BMP-format image
          and to display it. BMP (which presumably stands for BitMaP) is a
diff --git a/common/Kconfig b/common/Kconfig
index bbabadb35e..d0117e3dc8 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1157,7 +1157,7 @@ config IO_TRACE
config BMP
        bool "Enable bmp image display"
-       default y if CMD_BMP
+       default n
        help
          Enable bmp functions to display bmp image and get bmp info.

Since this is something that can be resolved by correcting the resulting
.config file (or storing a new defconfig in your build system, or what
have you) I'm not grabbing this for the release I'll be doing later
today.  Also in a v2, "default n" is the default. And I'm not entirely
sure if BMP (and SPL_BMP) end up being things that should be asked, or
should be select'd because they're library functions. Finally, this
should perhaps be part of
https://patchwork.ozlabs.org/project/uboot/list/?series=360683&state=*
but I'm not sure and will wait for Nikhil to chime in.

@Samuel, is it okay if I pick this patch and send it as a patch as part of my above mentioned series with the changes suggested by Tom?

Reply via email to