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: 726cd9836db0 ("efi: Make unicode printf available to the app")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/drivers/ufs/Kconfig b/drivers/ufs/Kconfig
index c2aafd3..69ea18e 100644 (file)
--- a/drivers/ufs/Kconfig
+++ b/drivers/ufs/Kconfig
@@ -3,6 +3,7 @@ menu "UFS Host Controller Support"
 config UFS
        bool "Support UFS controllers"
        depends on DM_SCSI
+       select CHARSET
        help
          This selects support for Universal Flash Subsystem (UFS).
          Say Y here if you want UFS Support.

diff --git a/lib/Kconfig b/lib/Kconfig
index e2697ab..acc0ac0 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -52,11 +52,6 @@ config CC_OPTIMIZE_LIBS_FOR_SPEED
 
 config CHARSET
        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
        bool "Enable Dynamic tables for CRC"

diff --git a/lib/efi/Kconfig b/lib/efi/Kconfig
index 15ce99e..c2b9bb7 100644 (file)
--- a/lib/efi/Kconfig
+++ b/lib/efi/Kconfig
@@ -14,6 +14,7 @@ choice
 
 config EFI_APP
        bool "Support running as an EFI application"
+       select CHARSET
        help
          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

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index 6b245f5..eb2d6fd 100644 (file)
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -14,6 +14,7 @@ config EFI_LOADER
        depends on DM_ETH || !NET
        depends on !EFI_APP
        default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8
+       select CHARSET
        select DM_EVENT
        select EVENT_DYNAMIC
        select LIB_UUID

diff --git a/test/Kconfig b/test/Kconfig
index e15ba23..7f3447a 100644 (file)
--- a/test/Kconfig
+++ b/test/Kconfig
@@ -91,6 +91,7 @@ config UT_UNICODE
        bool "Unit tests for Unicode functions"
        depends on UNIT_TEST
        default y
+       select CHARSET
        help
          Enables the 'ut unicode' command which tests that the functions for
          manipulating Unicode strings work correctly.