lib: fix selection of CONFIG_CHARSET

lib/charset.c is not optional for
EFI_APP || EFI_LOADER || UFS || UT_UNICODE.
These must select CONFIG_CHARSET.

Fixes: 726cd9836d ("efi: Make unicode printf available to the app")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2022-05-02 06:27:00 +02:00
parent c900a42eb0
commit d30924f16b
5 changed files with 4 additions and 5 deletions

View File

@ -3,6 +3,7 @@ menu "UFS Host Controller Support"
config UFS config UFS
bool "Support UFS controllers" bool "Support UFS controllers"
depends on DM_SCSI depends on DM_SCSI
select CHARSET
help help
This selects support for Universal Flash Subsystem (UFS). This selects support for Universal Flash Subsystem (UFS).
Say Y here if you want UFS Support. Say Y here if you want UFS Support.

View File

@ -52,11 +52,6 @@ config CC_OPTIMIZE_LIBS_FOR_SPEED
config CHARSET config CHARSET
bool bool
default y if UT_UNICODE || EFI_LOADER || UFS || EFI_APP
help
Enables support for various conversions between different
character sets, such as between unicode representations and
different 'code pages'.
config DYNAMIC_CRC_TABLE config DYNAMIC_CRC_TABLE
bool "Enable Dynamic tables for CRC" bool "Enable Dynamic tables for CRC"

View File

@ -14,6 +14,7 @@ choice
config EFI_APP config EFI_APP
bool "Support running as an EFI application" bool "Support running as an EFI application"
select CHARSET
help help
Build U-Boot as an application which can be started from EFI. This Build U-Boot as an application which can be started from EFI. This
is useful for examining a platform in the early stages of porting is useful for examining a platform in the early stages of porting

View File

@ -14,6 +14,7 @@ config EFI_LOADER
depends on DM_ETH || !NET depends on DM_ETH || !NET
depends on !EFI_APP depends on !EFI_APP
default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8
select CHARSET
select DM_EVENT select DM_EVENT
select EVENT_DYNAMIC select EVENT_DYNAMIC
select LIB_UUID select LIB_UUID

View File

@ -91,6 +91,7 @@ config UT_UNICODE
bool "Unit tests for Unicode functions" bool "Unit tests for Unicode functions"
depends on UNIT_TEST depends on UNIT_TEST
default y default y
select CHARSET
help help
Enables the 'ut unicode' command which tests that the functions for Enables the 'ut unicode' command which tests that the functions for
manipulating Unicode strings work correctly. manipulating Unicode strings work correctly.