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: d13805e26a1b ("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 c2aafd3020c977211b0916d2619c8f508f7680f7..69ea18edf8dfe0cc4cce9c6741a8f67d437b555d 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 e2697ab2ceb1896ab03da42fdab80ad2f06e06a0..acc0ac081a4421a430b204c73c2260557a135c87 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 15ce99e1a7417ce9296f47dfbf313d296fcfbe47..c2b9bb73f718db913b4334a658190119921522e5 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 6b245f50a726ec6f1586fd3d98ef2c3372a01358..eb2d6fddc4fce1504d9a6443d37cf22db726cf58 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 e15ba239eb3942ff2426e42d62abf837c2ea6177..7f3447ae5acd1271ffee6881fbd15d3e4ab9b05c 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.