summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2023-12-16 16:38:36 +0100
committerTom Rini <trini@konsulko.com>2024-01-11 21:19:25 -0500
commit64c67b68d1f0a9238cb0c4939ceb7afd124af9f9 (patch)
tree0796040a445e737c16b02b7f84b6428ff33acafb
parent6a8a23ccfb2486bc2f35f36c7eadeb1e13534055 (diff)
downloadu-boot-64c67b68d1f0a9238cb0c4939ceb7afd124af9f9.tar.gz
u-boot-64c67b68d1f0a9238cb0c4939ceb7afd124af9f9.tar.bz2
u-boot-64c67b68d1f0a9238cb0c4939ceb7afd124af9f9.zip
boot: CONFIG_CEDIT must depend on CONFIG_EXPO
Building sandbox_defconfig with CONFIG_CMD_CEDIT=y CONFIG_EXPO=n fails with cmd/cedit.c:258:(.text.do_cedit_run+0x4c): undefined reference to `expo_apply_theme Fix the dependencies. Fixes: a0874dc4ac71 ("expo: Add a configuration editor") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--boot/Kconfig2
-rw-r--r--boot/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/boot/Kconfig b/boot/Kconfig
index 9f5b8a0cb2..0894ecf4df 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1687,7 +1687,7 @@ menu "Configuration editor"
config CEDIT
bool "Configuration editor"
- depends on BOOTSTD
+ depends on EXPO
help
Provides a way to deal with board configuration and present it to
the user for adjustment.
diff --git a/boot/Makefile b/boot/Makefile
index a90ebea5a8..a47e002746 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -33,11 +33,11 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_CROS) += bootm.o bootm_os.o bootmeth_cros.o
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o
+obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL
obj-$(CONFIG_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o
obj-$(CONFIG_$(SPL_TPL_)EXPO) += bootflow_menu.o
obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o
-obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
endif
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o