At present EXPO requires CMDLINE since it uses cli_readline, which is enabled by CMDLINE. It should be possible to enter lines of text to an expo without having CMDLINE available.
Fix this dependency by creating a new Kconfig for cli_readline
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: - Add new patch with a Kconfig for command-line entry
boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 7 +++++++ common/Makefile | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/boot/Kconfig b/boot/Kconfig index 2fbe70245ec9..e71de0647bc5 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -649,6 +649,7 @@ config EXPO bool "Support for expos - groups of scenes displaying a UI" depends on VIDEO default y if BOOTMETH_VBE + select CLI_READLINE help An expo is a way of presenting and collecting information from the user. It consists of a collection of 'scenes' of which only one is diff --git a/cmd/Kconfig b/cmd/Kconfig index 3b4112d9f319..5cb45f9c025e 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -3,6 +3,7 @@ menu "Command line interface" config CMDLINE bool "Support U-Boot commands" default y + select CLI_READLINE help Enable U-Boot's command-line functions. This provides a means to enter commands into U-Boot for a wide variety of purposes. It diff --git a/common/Kconfig b/common/Kconfig index 1ffb055744d9..df5bac646491 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1164,3 +1164,10 @@ endif
config IO_TRACE bool + +config CLI_READLINE + bool + help + Enables support for reading a line of text from the user, This + feature is used by the command-line interpreter and also by expo, + which needs to read text when textline objects are used. diff --git a/common/Makefile b/common/Makefile index e22ced0c507f..a9c18c61895c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -38,7 +38,7 @@ obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o obj-$(CONFIG_MENU) += menu.o obj-$(CONFIG_UPDATE_COMMON) += update.o obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o -obj-$(CONFIG_CMDLINE_EDITING) += cli_cread.o +obj-$(CONFIG_CLI_READLINE) += cli_cread.o obj-$(CONFIG_CMDLINE) += cli_readline.o cli_simple.o
endif # !CONFIG_SPL_BUILD