{"id":2216038,"url":"http://patchwork.ozlabs.org/api/patches/2216038/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260325165431.1027591-14-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-14-sjg@chromium.org>","list_archive_url":null,"date":"2026-03-25T16:54:22","name":"[13/13] boot: Tidy local variables in fit_image_load()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cf0464630d7cee8bfe131bf39e8e4ef2d0ab1d49","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-14-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/2216038/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2216038/checks/","tags":{},"related":[],"headers":{"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;\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=F6W1aLaM;\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=\"F6W1aLaM\";\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 4fgtPX3nHCz1y1K\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 26 Mar 2026 03:57:36 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 5A83B83DA7;\n\tWed, 25 Mar 2026 17:56:06 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id 2029C840AB; Wed, 25 Mar 2026 17:56:03 +0100 (CET)","from mail-oi1-x234.google.com (mail-oi1-x234.google.com\n [IPv6:2607:f8b0:4864:20::234])\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 6EB7683AAB\n for <u-boot@lists.denx.de>; Wed, 25 Mar 2026 17:56:00 +0100 (CET)","by mail-oi1-x234.google.com with SMTP id\n 5614622812f47-467161c4b7aso4068b6e.1\n for <u-boot@lists.denx.de>; Wed, 25 Mar 2026 09:56:00 -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.55\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 25 Mar 2026 09:55:57 -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=1774457758; x=1775062558; 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=ybRUXoSCfavvLPDZeI/u+AYGnmOH+GFLNDwv1DHxeYk=;\n b=F6W1aLaMRwgQ0u3gUXEQ06pMqSguO4c+3hfTQGSPcSETwPeKAZyhozysjYHor5oan1\n 5O0XdrzBu7JSkZyfOG18Yh/CQQkmjUzj2lOFM2OrQK0Z0FAk9FPnBIAi+f5WGp+cspPK\n tqe2jz/CZFqVpNDQGDDTKH6dhLBu+81rXeIUY=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1774457758; x=1775062558;\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=ybRUXoSCfavvLPDZeI/u+AYGnmOH+GFLNDwv1DHxeYk=;\n b=aGq+W8lrK2k5bEegzOq07kUxCFDXuUhrb8LUSeOwPcHtT1xNTkANfpi/ropsnVEFjq\n zZlnGKAUFuW1MaseH0Af8wMGKrEsg/o7/y4iUJnRJK2Qe9LQFwl7jj4Gj06d4AY1U6b8\n 4g06emqZV/NftbIQJ40PYWkLmQYnuhkNVsUVaq+y4rC4w0F7j2AlcvYgNeYQ6s8bMecY\n +ocIkTi+VUzw1S2YobP1Ih1Vh779enjJwtFq6xLiMqgieETBx91c+S9UiDQNf3XRir+L\n BbZb+jXmxsgyP5Jcjkdg9c5In/0sO5cZoYzsQggBUcadzUVzsZKY+MIM6ZXDVX5G5nTO\n lrjA==","X-Gm-Message-State":"AOJu0YxKqrK8HU5gyzi0xpBugQ8IzcqmjpN9I9Cna60QExOuCnQNjxI2\n kE84FavYS8yz+FAbAI3dbwi/xvSzd/FBzYZm91Ctr4bB/MdoALk0oVvUD1IDd436d8GsqGk+TIa\n GE2kcBg==","X-Gm-Gg":"ATEYQzxlNm54h306P6cHToY2SRZ3Xt7pJLyE7+FP9ePXRjicVT8awfcapBZXJeZjIvd\n tLgXGrRDGbv5aOo+IjO3zZ6ReAgsgCGIbghJzHduXV9j4omRFuvcqLXulRikoPlZM5vD2xemJD1\n Yj7mYaTVSPpjfWOxvB5Oqg84LNjRQhubop7M8IEuegH/xYLudcdyYUd7/lEdoVg0c38MCCB6iA3\n K+p6AyobIxpcPQH2AuyZKImMGF9IuiERbqOuFnDAMrfM6t0xq+Auau89FOvMaOnpncKrsBtRQSc\n GEBWmSU7zeTeZG06n75+EgX2m/2BRVBpcZO5Wfyi6XC6Gf7Aa6jAuW/o2g1/dfHDDt7l3laDuq5\n QU8SfPpALugMyfwcee9RzvTZpLekgbycu8VS0h58jSYBLRYVCTSGoB7TSzwOmf3CUyuXOqJX68l\n d3KBZL4qFp6Yq6KDcfEw==","X-Received":"by 2002:a05:6808:1911:b0:467:1462:a9b3 with SMTP id\n 5614622812f47-46a5c6b4cb3mr2037018b6e.38.1774457758565;\n Wed, 25 Mar 2026 09:55:58 -0700 (PDT)","From":"Simon Glass <sjg@chromium.org>","To":"u-boot@lists.denx.de","Cc":"Simon Glass <sjg@chromium.org>,\n James Hilliard <james.hilliard1@gmail.com>,\n Marek Vasut <marek.vasut+renesas@mailbox.org>,\n Quentin Schulz <quentin.schulz@cherry.de>, Tom Rini <trini@konsulko.com>","Subject":"[PATCH 13/13] boot: Tidy local variables in fit_image_load()","Date":"Wed, 25 Mar 2026 10:54:22 -0600","Message-ID":"<20260325165431.1027591-14-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 <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n <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>,\n <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.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"Arrange these so that they look a little nicer.\n\nSigned-off-by: Simon Glass <sjg@chromium.org>\n---\n\n boot/image-fit.c | 11 +++++------\n 1 file changed, 5 insertions(+), 6 deletions(-)","diff":"diff --git a/boot/image-fit.c b/boot/image-fit.c\nindex 34876b66fa0..fe53b3a278b 100644\n--- a/boot/image-fit.c\n+++ b/boot/image-fit.c\n@@ -2472,15 +2472,14 @@ int fit_image_load(struct bootm_headers *images, ulong addr,\n \t\t   enum fit_load_op load_op, ulong *datap, ulong *lenp)\n {\n \tint image_type = image_ph_type(ph_type);\n-\tint noffset;\n-\tconst char *fit_uname;\n-\tconst char *fit_uname_config;\n \tconst char *fit_base_uname_config;\n+\tconst char *fit_uname_config;\n+\tconst char *fit_uname;\n+\tconst char *prop_name;\n+\tint noffset, ret;\n \tconst void *fit;\n-\tvoid *buf;\n \tulong load, len;\n-\tconst char *prop_name;\n-\tint ret;\n+\tvoid *buf;\n \n \tfit = map_sysmem(addr, 0);\n \tprop_name = fit_get_image_type_property(ph_type);\n","prefixes":["13/13"]}