Message ID | 20221207085137.445249-11-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=CEE4bNQq; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NRrjm4y4Kz23yq for <incoming@patchwork.ozlabs.org>; Wed, 7 Dec 2022 19:56:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EDCDE8559C; Wed, 7 Dec 2022 09:54:26 +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="CEE4bNQq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E381385565; Wed, 7 Dec 2022 09:54:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) (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 56D808558F for <u-boot@lists.denx.de>; Wed, 7 Dec 2022 09:54:20 +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-pg1-x52e.google.com with SMTP id v3so15690598pgh.4 for <u-boot@lists.denx.de>; Wed, 07 Dec 2022 00:54:20 -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=OePHrMLnxZFUZh4Q65iwUP2nj+ZG0OmpKPb6CGWt7CY=; b=CEE4bNQqzCkQcidy8D0Ze6DNNd8RiId3HhNJY8jQOQyL7j9TzzY+b+s7s3rznK2+Qu ZpXzdmf2XFaTP0kmXEI5edbvWs9q9OTqkAiQ/WV3/o0fPFTuBoGNSnbiUKPStZhvbKNq tlWKqWibtfp/nWGOiM4BkocOz8kDpmhLApGjg= 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=OePHrMLnxZFUZh4Q65iwUP2nj+ZG0OmpKPb6CGWt7CY=; b=SLVBO8OdnVMe2/lYDcZcfx/98g08JWkWYgtJNDpCv6AqOYk4W2jjQ/ByAOkGtVrw4Y wFIdjAv3kWS4qVUsXGPZL0N25UPveajJZYqt1984MX2kPItdpPin2joffLCSJYAQuWBl eFI6ZkrcRUAc+FVqzyhKhmf+f4VGO7Z+pyocc/N6N7wxtvBCK2gpf5oL32ACULX6M0/6 8rKtgxyLJg8X0fvCkxvoPfd7f1u7nVIB/nNI6DMeOJ+jHJ11YjgHPICIxYUq4L5+IHRj fGPadsT6TndRLqchwFqSpFrQVwol7hbFWRNzZI/ioBOXP7dmKE5ygGJzX/tiTB1Ad17q xtIA== X-Gm-Message-State: ANoB5plSDoUvO5h1fTMJn7lB754d/Bjm8SVzh+mGT+/2Y+g7whJt5MH0 zYFB3Py3HCYOAwYY73yQdSRC0IT70HMzzoT5 X-Google-Smtp-Source: AA0mqf5XZB3m4i6BxA1MtE6XZqwFLRGSMq2S5k1p66qeGP9A+oT7mRN3XhFuI/6dPCDI/GwNf+ZiEg== X-Received: by 2002:a05:6a00:4488:b0:577:599d:b2b7 with SMTP id cu8-20020a056a00448800b00577599db2b7mr4473918pfb.25.1670403259668; Wed, 07 Dec 2022 00:54:19 -0800 (PST) Received: from localhost.localdomain ([27.110.126.54]) by smtp.gmail.com with ESMTPSA id l16-20020a170903121000b0018157b415dbsm14145514plh.63.2022.12.07.00.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 00:54:19 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: U-Boot Custodians <u-boot-custodians@lists.denx.de>, Simon Glass <sjg@chromium.org> Subject: [PATCH 10/71] vbe: Avoid a build failure when bloblist is not enabled Date: Wed, 7 Dec 2022 21:50:36 +1300 Message-Id: <20221207085137.445249-11-sjg@chromium.org> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog In-Reply-To: <20221207085137.445249-1-sjg@chromium.org> References: <20221207085137.445249-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
bootstd: Allow migration from distro_bootcmd scripts
|
expand
|
diff --git a/cmd/vbe.c b/cmd/vbe.c index befaf07c64d..600690394eb 100644 --- a/cmd/vbe.c +++ b/cmd/vbe.c @@ -79,10 +79,13 @@ static int do_vbe_info(struct cmd_tbl *cmdtp, int flag, int argc, static int do_vbe_state(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - struct vbe_handoff *handoff; + struct vbe_handoff *handoff = NULL; int i; - handoff = bloblist_find(BLOBLISTT_VBE, sizeof(struct vbe_handoff)); + if (IS_ENABLED(CONFIG_BLOBLIST)) { + handoff = bloblist_find(BLOBLISTT_VBE, + sizeof(struct vbe_handoff)); + } if (!handoff) { printf("No VBE state\n"); return CMD_RET_FAILURE;
This needs to be able to work (at least partially) without the bloblist active. Add a condition for this. Signed-off-by: Simon Glass <sjg@chromium.org> --- cmd/vbe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)