From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49A98C636CB for ; Sat, 28 Jan 2023 22:02:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DF1F28575C; Sat, 28 Jan 2023 23:01:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="QxegH6v9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 128B4856DD; Sat, 28 Jan 2023 23:01:29 +0100 (CET) Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C68A485763 for ; Sat, 28 Jan 2023 23:01:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id p12so3741521ilq.10 for ; Sat, 28 Jan 2023 14:01:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dR0tawRj5xvdwxpRee4w58IkigYrWirw8bg5c7b5PEA=; b=QxegH6v9M8WWjZdUWmX1o5cIt4v03micBaWPybRufNCAbOPlRi89f5dDpWe0e18ycv mWRLd8XKIHuQyKvdhYsK2HdiYGV/eY5uGMk/6Ob2oLMcfSzb0cXZAVAG31YlV8U/8V87 U4xHc9gHBZNsUX7//KYEFPbDw27KHWGwhyq4w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dR0tawRj5xvdwxpRee4w58IkigYrWirw8bg5c7b5PEA=; b=M6/JK+SiHXO4pNy6hDoccM9hH28+GtXy1GYAzHPBFt5yy7TOyz5gpUeLDmiKqjaGpj wyW1GI80hyYjSjtML8ADqF+3a8W7xVTNTs0GtuuLZfPUxs0h+pxJHTA9LxLYeT5DE7l1 BbaLTE7lvBtSCN+SowjfWIog0wE43B44T7shAc3rDVr6d556A60AHwIQA+fEBEzJykrn BfeI5Yx1ebJP6rsCXo9LJfYPwH+33hXgmrIvR/XzEXXis6/2wnUgtJKCL/ydjI41Yz04 CPAeTJkSpEvHyPZWteYWsRWzzEWoKgUwQqLozU7pJF1KlHYd5fgcBKUXi3icoMx43Wv1 U4pQ== X-Gm-Message-State: AO0yUKXhIVjTCgw6+EStfSins+10n3BepISxL/elXKoGPClJs+cz7EcD +pp58ZEnjJVJMrPRUJauOkO+BHdvZF6EOFzK X-Google-Smtp-Source: AK7set/vTaX/9N8ECT7dE+YXPK7cSqNXe3dxEsMY7lbXyCAOFD1HnUcfrvaaUw2YRkKqQsp425wKHQ== X-Received: by 2002:a92:c24a:0:b0:310:d893:ae17 with SMTP id k10-20020a92c24a000000b00310d893ae17mr2712847ilo.32.1674943268421; Sat, 28 Jan 2023 14:01:08 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id f15-20020a056e0212af00b0030f1be2e051sm2525521ilr.39.2023.01.28.14.01.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 14:01:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Albert Aribaud , Ilias Apalodimas , Simon Glass , Andre Przywara , John Keeping , Philippe Reynes Subject: [PATCH 03/13] bootstd: Allow enabling BOOTSTD_FULL without needing EXPO Date: Sat, 28 Jan 2023 15:00:18 -0700 Message-Id: <20230128220028.53575-4-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230128220028.53575-1-sjg@chromium.org> References: <20230128220028.53575-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean It is sometimes useful to have one without the other, e.g. on a device without a display, since at present the expo feature requires CONFIG_VIDEO to be enabled. Update the Makefile and bootflow command to support this, as well as the EXPO dependency. Signed-off-by: Simon Glass --- boot/Kconfig | 1 + boot/Makefile | 4 ++-- cmd/bootflow.c | 21 +++++++++++++-------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index fdcfbae7b2c..98e194fc2b2 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -561,6 +561,7 @@ endif # BOOTMETH_VBE config EXPO bool "Support for expos - groups of scenes displaying a UI" + depends on VIDEO default y if BOOTMETH_VBE help An expo is a way of presenting and collecting information from the diff --git a/boot/Makefile b/boot/Makefile index f990e66f522..43baf2b89b3 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -30,7 +30,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL obj-$(CONFIG_$(SPL_TPL_)CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o -obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o +obj-$(CONFIG_$(SPL_TPL_)EXPO) += bootflow_menu.o endif obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o @@ -48,7 +48,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o endif -obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += expo.o scene.o scene_menu.o +obj-$(CONFIG_$(SPL_TPL_)EXPO) += expo.o scene.o scene_menu.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_request.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE) += vbe_simple.o diff --git a/cmd/bootflow.c b/cmd/bootflow.c index 692bc6d117f..3548bbb6830 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -394,15 +394,20 @@ static int do_bootflow_menu(struct cmd_tbl *cmdtp, int flag, int argc, if (ret) return CMD_RET_FAILURE; - ret = bootflow_menu_run(std, text_mode, &bflow); - if (ret) { - if (ret == -EAGAIN) - printf("Nothing chosen\n"); - else - printf("Menu failed (err=%d)\n", ret); - - return CMD_RET_FAILURE; + if (IS_ENABLED(CONFIG_EXPO)) { + ret = bootflow_menu_run(std, text_mode, &bflow); + if (ret) { + if (ret == -EAGAIN) + printf("Nothing chosen\n"); + else + printf("Menu failed (err=%d)\n", ret); + } + } else { + printf("Menu not supported\n"); + ret = -ENOSYS; } + if (ret) + return CMD_RET_FAILURE; printf("Selected: %s\n", bflow->os_name ? bflow->os_name : bflow->name); std->cur_bootflow = bflow; -- 2.39.1.456.gfc5497dd1b-goog