diff mbox series

[Concept,11/24] bootctl: Plumb in the feature

Message ID	20251018084117.1798704-12-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Sat, 18 Oct 2025 02:40:56 -0600 Message-ID: <20251018084117.1798704-12-sjg@u-boot.org> In-Reply-To: <20251018084117.1798704-1-sjg@u-boot.org> References: <20251018084117.1798704-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 7ZJ6O36QKCASLJO54HE5UPZSK7DTRXHE CC: Simon Glass <sjg@chromium.org> Precedence: list Subject: [Concept] [PATCH 11/24] bootctl: Plumb in the feature Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/7ZJ6O36QKCASLJO54HE5UPZSK7DTRXHE/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	bootctl: Expand bootctl to include a new UI \| [Concept,00/24] bootctl: Expand bootctl to include a new UI [Concept,01/24] test/py: Make test_bind_unbind_with_uclass() independent [Concept,02/24] test/py: Mark a few more tests as slow [Concept,03/24] bloblist: Add a name for the EFI log [Concept,04/24] bloblist: Provide a way to remove a blob [Concept,05/24] tpm: Correct address handling in tcg2_platform_get_log() [Concept,06/24] scripts: build-efi: Use a locally built OVMF image [Concept,07/24] boot: test: Add another Ubuntu image on mmc11 [Concept,08/24] boot: Allow switching back to another layout [Concept,09/24] test: Correct an incomplete sentence in prep_mmc_bootdev() [Concept,10/24] sandbox: Enable Ubuntu fonts [Concept,11/24] bootctl: Plumb in the feature [Concept,12/24] bootctl: Create a common struct for the BOOTCTL_UI uclass [Concept,13/24] bootctl: Avoid hanging on failure [Concept,14/24] bootctl: Provide an option to slow the display refresh [Concept,15/24] bootctl: Respect the autoboot option [Concept,16/24] bootctl: Re-apply the theme when showing the UI [Concept,17/24] bootctl: Bring in some additional images [Concept,18/24] bootctl: Add an option to switch the layout [Concept,19/24] bootctl: Provide a multi-themed UI [Concept,20/24] bootctl: Disable autoboot [Concept,21/24] bootctl: Add a test for the multi UI [Concept,22/24] efi: x86: Provide settings for bootctl [Concept,23/24] efi: x86: Enable required Kconfig options for bootctl [Concept,24/24] efi: x86: Use only serial for input

Commit Message

Simon Glass Oct. 18, 2025, 8:40 a.m. UTC

  From: Simon Glass <sjg@chromium.org>

The code is present but is not currently enabled. Add Makefile rules
so that it is built. Also add a gitignore for bootctl.ini since this
file is created when 'bootctl run' is used.

Update the Kconfig rule to disable this by default, except for sandbox
the EFI app. Add a dependency on CMDLINE since the textline object
calls cread_line_process_ch() which is otherwise not available.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 .gitignore    | 2 ++
 boot/Kconfig  | 4 ++--
 boot/Makefile | 2 ++
 cmd/Makefile  | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/.gitignore b/.gitignore
index 6b95c85b9b8..986ab7ffda3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,3 +134,5 @@  __pycache__
 
 # Clang's compilation database file
 /compile_commands.json
+
+bootctl.ini
diff --git a/boot/Kconfig b/boot/Kconfig
index b255245335b..cde4472ca57 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -507,8 +507,8 @@  config BOOT_DEFAULTS
 
 config BOOTCTL
 	bool "Support for boot control"
-	depends on BOOTSTD
-	default y
+	depends on EXPO && CMDLINE
+	default y if SANDBOX || EFI_APP
 	help
 	  This supports an experimental boot control, providing a way to
 	  discover and boot Operating Systems.
diff --git a/boot/Makefile b/boot/Makefile
index 3cb138ae022..cfa5a0a98e9 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -17,6 +17,8 @@  obj-y += image.o image-board.o bootm_final.o
 obj-$(CONFIG_ANDROID_AB) += android_ab.o
 obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
 
+obj-$(CONFIG_$(PHASE_)BOOTCTL) += bootctl/
+
 obj-$(CONFIG_$(PHASE_)BOOTSTD) += bootdev-uclass.o
 obj-$(CONFIG_$(PHASE_)BOOTSTD) += bootflow.o
 obj-$(CONFIG_$(PHASE_)BOOTSTD) += bootmeth-uclass.o
diff --git a/cmd/Makefile b/cmd/Makefile
index 1d65703b625..b73725cfe41 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -21,6 +21,7 @@  obj-$(CONFIG_CMD_AES) += aes.o
 obj-$(CONFIG_CMD_ADC) += adc.o
 obj-$(CONFIG_CMD_ARMFLASH) += armflash.o
 obj-$(CONFIG_BLK) += blk_common.o
+obj-$(CONFIG_CMD_BOOTCTL) += bootctl.o
 obj-$(CONFIG_CMD_BOOTDEV) += bootdev.o
 obj-$(CONFIG_CMD_BOOTFLOW) += bootflow.o
 obj-$(CONFIG_CMD_BOOTMETH) += bootmeth.o