From patchwork Mon Dec 8 02:32:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 844 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765161220; bh=HpXT3ToCbRYnDp2mxGIahIRNB8Xwp3tdCGiq0sCIxac=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=v8frXqWfT/11u9sggfE66rg/nvFMKdZOm8875997l5giKTXX+c8/tfnYQAkPUhjXq f+rm1fin0vJ7jf8D+fltyknzPWl6N/PhI90B+tktBgqzxc4G7XRcuuVjsQ909agLGC fYbVu9m0jJYHHkXd0IfwbTt3pY2sMWSl45QQlcKwgfHtYD2c/ApTgZBzQ6DVAZ4uKx Np/RAg4oRSkv9hIksfBIZrfeI2kDK38fNCioFBD8xXQecH+NCchgVrmg7lT4OiiWc+ Fi//W0cihrpih5FLLPnqDjzPCWpckFH5cjHpBYUuzcUqspYeLkla+1i5d1VmjGL2tl A7HQDS6J1Yh6A== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D50CB689C5 for ; Sun, 7 Dec 2025 19:33:40 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id hgHplvdTdIcN for ; Sun, 7 Dec 2025 19:33:40 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765161220; bh=HpXT3ToCbRYnDp2mxGIahIRNB8Xwp3tdCGiq0sCIxac=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=v8frXqWfT/11u9sggfE66rg/nvFMKdZOm8875997l5giKTXX+c8/tfnYQAkPUhjXq f+rm1fin0vJ7jf8D+fltyknzPWl6N/PhI90B+tktBgqzxc4G7XRcuuVjsQ909agLGC fYbVu9m0jJYHHkXd0IfwbTt3pY2sMWSl45QQlcKwgfHtYD2c/ApTgZBzQ6DVAZ4uKx Np/RAg4oRSkv9hIksfBIZrfeI2kDK38fNCioFBD8xXQecH+NCchgVrmg7lT4OiiWc+ Fi//W0cihrpih5FLLPnqDjzPCWpckFH5cjHpBYUuzcUqspYeLkla+1i5d1VmjGL2tl A7HQDS6J1Yh6A== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id BE4016894D for ; Sun, 7 Dec 2025 19:33:40 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765161219; bh=Z3pIWbr6avFmarzp61PijrmRhnwFTE5SMlrs0hQ10dM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kt9viPr5OWvIZ2GQhM7I0sPaC8FXbaB/SKWP0R828CiPmoZ8dd/6zE50Gti7fsdGF I2JCqNEy9IjECmZNJBYZe8c+C4iJLF7eGQT4DSQQ5D4V8WF7WkzL7ug6KboDbocazO woREoRzWrVoAcTQC6+dDssjH1nOUtZy1jAWqmOzHXcs5cuICWVQ/jJiL3jXdODCbzx iwW0m5wyvHNs9scQ3TA+yqp/473Cp/sdymnwNNrwHgS/gLYuRruZw3zgUGkzNAVXlx X+BVyUiOpNBlN4NQQkFK9WzC9M9jJKjlC05/8//lZWKNJwRPlBu5COO18BToi/lRNi reRMAuWI2SqSg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 809EA68930; Sun, 7 Dec 2025 19:33:39 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id 9rG6kErirj8n; Sun, 7 Dec 2025 19:33:39 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765161215; bh=qZzkPMZmH16wRYtc9b14Z836d4ULLUuJd5EmGsYil+k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZF6jcHAwH6d25qRmtgdBI9Ki0v/qI5htyNLSwAf5dS4bHUY+Sd27T9wCnM2QDZKMC ppze+6gHATR0JbWB0KFtva5CVKUead6Hw3Sa+rFALt27/WqM20FUXGLXq5xqGY5bdK +C+O1p+ct+fp4OBrUGTbglnKrs+WdTO9BOhU63taGikJuumDMRfcn2upAQF0yluQ5E FcqGorfEXwVd9wGKed7bZoSEwQ21Mvtpeikt5ptdaWLPuAmV3zZP1mSc4MHOauCK7y 3HOsVTN1PqEOpo+5pjHQe6KhB4ikKjxo3kIjXNq9Q027oPQfddKGJvaDNn+Ahp3Sop 6KCC7G7qwVF+w== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 3A5DD688F0; Sun, 7 Dec 2025 19:33:35 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Sun, 7 Dec 2025 19:32:14 -0700 Message-ID: <20251208023229.3929910-12-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251208023229.3929910-1-sjg@u-boot.org> References: <20251208023229.3929910-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: Y6TG5M2UTN5HAA7ZOYV7RGBBCMFD6P72 X-Message-ID-Hash: Y6TG5M2UTN5HAA7ZOYV7RGBBCMFD6P72 X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 11/19] bootctl: Clean up some unwanted debugging in the logic List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Tidy up the code style for checking the result of read_images() and drop some commented-out debug lines. Also fix a shadowed variable while we are here. Signed-off-by: Simon Glass --- boot/bootctl/logic.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/boot/bootctl/logic.c b/boot/bootctl/logic.c index d3ee7b2fa6c..be00c965b66 100644 --- a/boot/bootctl/logic.c +++ b/boot/bootctl/logic.c @@ -74,8 +74,6 @@ static int logic_start(struct udevice *dev) int ret; if (priv->opt_persist_state) { - int ret; - /* read in our state */ ret = bc_state_load(priv->state); if (ret) @@ -263,17 +261,12 @@ static int logic_poll(struct udevice *dev) * this */ ret = read_images(dev, os); - if (ret && ret != -ENOSYS) { - if (ret) - return log_msg_ret("lri", ret); - } + if (ret && ret != -ENOSYS) + return log_msg_ret("lri", ret); ret = prepare_for_boot(dev, os); if (ret) return log_msg_ret("lpb", ret); - /* debugging */ - // return -ESHUTDOWN; - /* boot OS */ ret = bootflow_boot(&os->bflow); if (ret)