{"id":2216026,"url":"http://patchwork.ozlabs.org/api/patches/2216026/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260325165431.1027591-3-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260325165431.1027591-3-sjg@chromium.org>","list_archive_url":null,"date":"2026-03-25T16:54:11","name":"[02/13] boot: Move call to fit_image_select() and rename it","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"335634d9b9c4393dde112baf6e1e0a0a5cb56f4c","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260325165431.1027591-3-sjg@chromium.org/mbox/","series":[{"id":497475,"url":"http://patchwork.ozlabs.org/api/series/497475/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=497475","date":"2026-03-25T16:54:09","name":"boot: Make fit_image_load() easier to maintain","version":1,"mbox":"http://patchwork.ozlabs.org/series/497475/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2216026/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2216026/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256\n header.s=google header.b=JwWajHy2;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org\n header.b=\"JwWajHy2\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=sjg@chromium.org"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgtMY5x8zz1y1K\n\tfor ; Thu, 26 Mar 2026 03:55:53 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 8A9E78352B;\n\tWed, 25 Mar 2026 17:55:39 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id 94DEF81E18; Wed, 25 Mar 2026 17:55:37 +0100 (CET)","from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com\n [IPv6:2607:f8b0:4864:20::22c])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 6EBCA83CE3\n for ; Wed, 25 Mar 2026 17:55:35 +0100 (CET)","by mail-oi1-x22c.google.com with SMTP id\n 5614622812f47-4671cbce32bso1263572b6e.3\n for ; Wed, 25 Mar 2026 09:55:35 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 5614622812f47-46a7099df08sm30481b6e.15.2026.03.25.09.55.32\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 25 Mar 2026 09:55:32 -0700 (PDT)"],"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,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=chromium.org; s=google; t=1774457733; x=1775062533; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=0aJrQG8XRWBHZl6VfER3lu7iHsqvl7UsVZRmTMouPOg=;\n b=JwWajHy2vIdjbJ4yWHrk1HyGeVYle9CrWkgmFy5SWEiN4XKFyZ08iwGY0o8DAjLABi\n cw3PDYAfvo83K/AFVtjUaXTuioTvSs1TwdfJ1lRtJ1aEQAxIGRPSON1wyx9KGeJsaBhK\n hn/kk3D8kKd5u/r8ly+pujYpQQc2Bf3HRpKAg=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1774457733; x=1775062533;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=0aJrQG8XRWBHZl6VfER3lu7iHsqvl7UsVZRmTMouPOg=;\n b=lIwt7S+0/GVICjyWsVLAT+3ftet/dA2RkmevpOhSmz4q0L+znEV6LFu0/FDIVHQwRN\n KIrG6SNp4ac0E8D5+a4wwJHo9olUVFtvtVY6HPAnkTnLRtZpet8MDNfSa3k4h1+f9Bog\n JbLwApLAIShxYd3KrlRG39GZLJgxm8laNuQmxShK3cXxYA+QqZ7ezFZPh1ba/+vh36MW\n Z4B442mmkm0vmt5lGIS0jgoCNHVHOgsmDDUIb+CkPcZvMNg8liEAlT1uJDSIjvVkDnQi\n uTbyde3YdqG8YlminZk4ZRhD1nqnODPAgmrY6JDytXsZFbP0EO/NV6UHK4JOaOEuOKHF\n TGzQ==","X-Gm-Message-State":"AOJu0YxUOLyVI9uhz4SNE+Ftrp13DF5UAakAb3zKkRIl9Bd06oHkiqA8\n eeVMOSU0PIQCSEeKQ+r7WIpVv7xOiFx7kVnNx6Z3BDT+K8XcVn2M0CMDRr83I8Je5yBQfyLKgG1\n cbIjR5g==","X-Gm-Gg":"ATEYQzzzwRehmlLQMkfbTMq2/yzry4OGt5KQ/CmEWq5H1lrvmCXu5psYnlhYvr5ssiW\n GxbkKg5XIWpH+BjcGK9OYJA2C3P+qvDKKjl5XHSEkL1tDM7uI9/SCtTZ7sFfxIaYY1XHtpjNdnS\n zqZJfF260sCrxqLVim4b39SEh+gi8raN2qcgP2uK1rP3BwpShKlMEN6Gar1ZA+kltVgevss5Ktq\n NQf1vqTfDHSgaLSYpEOVanZrz7GnMq8wQeziywLnETtIrI7+15uHKGBFefcI2hPAdnYnnAO7wDK\n v77W+0olRNKpaxSO3YE1GcXO+cXpKw4an79+I+2hlFBpbJ2JpDEiOFUlDbTnPLxvudLtUPznFe/\n dcFEhcmXxOpems+Vx7hXqJSIW4xGAuy2SfXCWYDRlcUXhLByh42nJDyiFUGxTeeL/wOk0juF0NM\n fjtERZ1CNnTy1mpuFPIg==","X-Received":"by 2002:a05:6808:1a02:b0:468:e7b:c8eb with SMTP id\n 5614622812f47-46a5c7248f6mr1962771b6e.37.1774457733615;\n Wed, 25 Mar 2026 09:55:33 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass ,\n James Hilliard ,\n Marek Vasut ,\n Quentin Schulz , Tom Rini ","Subject":"[PATCH 02/13] boot: Move call to fit_image_select() and rename it","Date":"Wed, 25 Mar 2026 10:54:11 -0600","Message-ID":"<20260325165431.1027591-3-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260325165431.1027591-1-sjg@chromium.org>","References":"<20260325165431.1027591-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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"This function is named a bit vaguely, since it prints some info and then\ndoes verification of the image.\n\nRename it to print_and_verify() and move the call to select_image().\n\nSigned-off-by: Simon Glass \n---\n\n boot/image-fit.c | 14 ++++++--------\n 1 file changed, 6 insertions(+), 8 deletions(-)","diff":"diff --git a/boot/image-fit.c b/boot/image-fit.c\nindex a4402dcff63..f8772f64cb3 100644\n--- a/boot/image-fit.c\n+++ b/boot/image-fit.c\n@@ -1989,7 +1989,7 @@ int fit_get_data_conf_prop(const void *fit, const char *prop_name,\n \treturn fit_get_data_tail(fit, noffset, data, size);\n }\n \n-static int fit_image_select(const void *fit, int rd_noffset, int verify)\n+static int print_and_verify(const void *fit, int rd_noffset, int verify)\n {\n \tfit_image_print(fit, rd_noffset, \" \");\n \n@@ -2168,6 +2168,11 @@ static int select_image(const void *fit, struct bootm_headers *images,\n \t\t*fit_unamep = fit_get_name(fit, noffset, NULL);\n \n \tprintf(\" Trying '%s' %s subimage\\n\", *fit_unamep, prop_name);\n+\tret = print_and_verify(fit, noffset, images->verify);\n+\tif (ret) {\n+\t\tbootstage_error(bootstage_id + BOOTSTAGE_SUB_HASH);\n+\t\treturn ret;\n+\t}\n \n \treturn noffset;\n }\n@@ -2190,7 +2195,6 @@ int fit_image_load(struct bootm_headers *images, ulong addr,\n \tulong load, load_end, data, len;\n \tuint8_t os, comp;\n \tconst char *prop_name;\n-\tint ret;\n \n \tfit = map_sysmem(addr, 0);\n \tprop_name = fit_get_image_type_property(ph_type);\n@@ -2205,12 +2209,6 @@ int fit_image_load(struct bootm_headers *images, ulong addr,\n \tif (noffset < 0)\n \t\treturn noffset;\n \n-\tret = fit_image_select(fit, noffset, images->verify);\n-\tif (ret) {\n-\t\tbootstage_error(bootstage_id + BOOTSTAGE_SUB_HASH);\n-\t\treturn ret;\n-\t}\n-\n \tbootstage_mark(bootstage_id + BOOTSTAGE_SUB_CHECK_ARCH);\n \tif (!tools_build() && IS_ENABLED(CONFIG_SANDBOX)) {\n \t\tif (!fit_image_check_target_arch(fit, noffset)) {\n","prefixes":["02/13"]}