Skip to content

Commit e1b16ea

Browse files
committed
common: Kconfig: Fix CMD_BMP/BMP dependency
Using `default y` will not select BMP when CMD_BMP has been enabled, if it was already configured. By using `depends on`, if `CMD_BMP` is turned on, it will force the presence of `BMP`. Reproduced by: ``` make pinebook_defconfig make menuconfig (enabling CMD_BMP) make ``` Ends-up with: ``` aarch64-unknown-linux-gnu-ld.bfd: boot/pxe_utils.o: in function `handle_pxe_menu': .../u-boot/2023.07-rc6/boot/pxe_utils.c:1541: undefined reference to `bmp_display' aarch64-unknown-linux-gnu-ld.bfd: cmd/bmp.o: in function `do_bmp_display': .../u-boot/2023.07-rc6/cmd/bmp.c:68: undefined reference to `bmp_display' aarch64-unknown-linux-gnu-ld.bfd: cmd/bmp.o: in function `do_bmp_info': .../u-boot/2023.07-rc6/cmd/bmp.c:35: undefined reference to `bmp_info' ``` Fixes: 072b0e1 ("common: Kconfig: Add BMP configs") Signed-off-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
1 parent 05aa651 commit e1b16ea

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

cmd/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1988,6 +1988,7 @@ config CMD_2048
19881988
config CMD_BMP
19891989
bool "Enable 'bmp' command"
19901990
depends on VIDEO
1991+
select BMP
19911992
help
19921993
This provides a way to obtain information about a BMP-format image
19931994
and to display it. BMP (which presumably stands for BitMaP) is a

common/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ config IO_TRACE
11571157

11581158
config BMP
11591159
bool "Enable bmp image display"
1160-
default y if CMD_BMP
1160+
default n
11611161
help
11621162
Enable bmp functions to display bmp image and get bmp info.
11631163

0 commit comments

Comments
 (0)