From patchwork Sun Dec 28 15:17:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4397 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 77E2940D1F for ; Sun, 28 Dec 2025 16:18:35 +0100 (CET) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-b70b1778687sf751210166b.0 for ; Sun, 28 Dec 2025 07:18:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1766935115; cv=pass; d=google.com; s=arc-20240605; b=cSEzAm8gFqu5QKXdDRACav+LYWrkWEysKPTBabsxew52a2NIkzJMEkR7GlfMi+M+9l fW2A69RkhJnveeefiKkNIspEbQXMH1uKGnQ0PgYYIHiHqSuFibpaTfi8sKNCzc+jZknd /vRr8IIFEqH+3JkOrDViBU/y/9AQducHrOjhtr762+d6zi80quQ3CGPsC+EFv/zck9QL ViPlu4t2Ig4DwVWM0PZy7MpcO+uG6hPy/9KemCW9bHEnGFpgjQv/xK3vyDXc+hGS4iDy opwun5BOg0llCSjXVSQ/jgxA437QJ/2tqW2n6vT1z+TBVCq4dxc2WXYwsbFwZ7bbp4qq hP9A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=166EY9mFw3A7LnP1dROVFppLgStnJvwHqft4o2OAtyw=; fh=KI/XG17W5j6TWt5dJ0T7HfULW/+hpuC2LVcXXOwp7dQ=; b=LCVAxbLD5n9wqfvoVbBEDhTWDMyhz37Bu0vYIQI34UCpCVRGWqG3Q71lDL7s14TOmK TOlPk0DQ4U3VKq0i2RE96aIoWbqtetLumHDqbE8Zh93GHd83E08THA75aD9PGd1PPPGD 7cZXTeMZgkdsdB2aAFy3TXE93IBtRvsv+eWU8jchMw+rfr7ShrWI7NWN1F2DPawt3r4S toVJir0EpgRUxgY+SDxegoS5VViBOUO4kCjAO2QeZu3uvL3+Zy1w6B3zEgWiAxZj1gLu T7E4ilbmyHcqIKBrRARZerorgaHS2kEALMEHLCoYqjVrY1BME2tMF1bsu1OaqBauhD/F WQFg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="dAWNj/qA"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1766935115; x=1767539915; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=166EY9mFw3A7LnP1dROVFppLgStnJvwHqft4o2OAtyw=; b=AfZ0JXwp+1/l9r4zvFpEDlB//aqsC0ekPvJikWabj3z7JyBjigny+GVAL3rgcwGObY L8y49xtuWfdWHVH09a6iK1HAOWIaW1NK5fb9E0zuwQr5h24VIk4AEhoSzF7xwPMMyBeo RWQ63XuAYSERETUr80RpjX1WEwnVwNugaH0AA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766935115; x=1767539915; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=166EY9mFw3A7LnP1dROVFppLgStnJvwHqft4o2OAtyw=; b=tAwR1Dd0o182XmndQnaQbPpOmqLu67ALfY6bVdRouL65MjUEUQvGfFaWhC3nb3AmMx V17dC8eLgvJN+gCvk8Vc6MhZFf5L447jkcpwj0r1ir4n1m1O/5YI0KoUwhs16GUUh29b VfWPwrBe54kCQC7eUzuq3E36WfhkhlHfrknDb6hHiuLL6SaALCoTvmqyt7jQIcrXx0Uv YMvtxtS6Rik2YJsl6a0HguQKju5B0Fa/HPHrX4TxcbGr62YGSAWeAqyDoBy5Vodq9xmc +++ULzfjPLPhog7ug2jmjUL6gezdLNfZKoXwnL7Cb3O6odO9v6PFKcTwZ66lGcor2anZ 6WwA== X-Forwarded-Encrypted: i=2; AJvYcCXlbryUvJLEIQYBttQnMYceA1t/Spr30CBMJ8b9zMB9bkhpoT4kF1nk+1P+NpacZ2kCiH3yNFwRyHMHJllQ@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwqGhvBdwvGi4zhHL7dAf3WJcry77FjrV3XnAmJA7Pt8RUWmi5G NaC8IovTm+kMO3PO6ZS2mXlnyl++4pTvTZrLNdu3UiL+CFW85XBSUJLXJgXbrYkb6f5DnQ== X-Google-Smtp-Source: AGHT+IFV/kWu0FRXQ2UO2DPQi9ng6xVXGutceZ517N6ojkXKOfAMu+EUGE97hr/loWMXma7pNKFJlg== X-Received: by 2002:a17:907:6ea7:b0:b73:8639:cd93 with SMTP id a640c23a62f3a-b8036f2ab38mr2848777466b.14.1766935114834; Sun, 28 Dec 2025 07:18:34 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com; h="AWVwgWb11c2Yfh9Ibcl0IB32k6t8wfc1mKkmNMoHO/WK4hTnvw==" Received: by 2002:a05:6402:c0d:b0:64b:9695:8dac with SMTP id 4fb4d7f45d1cf-64b96958f8als3447505a12.2.-pod-prod-05-eu; Sun, 28 Dec 2025 07:18:33 -0800 (PST) X-Received: by 2002:a05:6402:40c7:b0:649:815e:3f9b with SMTP id 4fb4d7f45d1cf-64b8eb6362dmr26949207a12.3.1766935112888; Sun, 28 Dec 2025 07:18:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1766935112; cv=none; d=google.com; s=arc-20240605; b=DspwTFV6IoMN/qB9hLa2K7X/minIX2n2ZtmefsYZcxsAU/Ro9GMQPExCHdgHv9k8uS ERfMTEvxmW2MSYQX6HVTdXP9N2QYxhC6m+MLJWUUOZhH0HeHBeQaze9avkUds9rSnMU/ 8QD9QIsKwFGBxuYAtuG2pUQkIxKWPNYNCTchT1MSXOFmdfrhdr9Cdr3gqwbzvIqo3lfD OfAmXa40efiyII4ocg2PCLwHQG791TkhiEbB+Rgx+14g8wsSZ3Cok25Z8Gerp7ZqmB5C UOV95syj58wQqtcy7FigmTsIe1MN8V8lI7FKWNGDLVJa0ZHaHJlH8iI+yEX/BCHzF0Sa 2ImA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=YzJuXGQSStABSLVPgjHFs97hDaXLItw0yHVdWoWGDI0=; fh=/bAArACFVSPsJcZkTTDYXnBqjKorqlCG7F6Jhy9vEhk=; b=eARz7IIKtvscUQi5+iK8ukgOPTAY9Rk2Di+DQaRle97YyCzRTKA/ZTW1J/afGDxXFq n1zSRzpH86BUyWvhZwdNX5l/xHXOi9CB3uGLVwCVayCeDzHzHk58RJPz9A5xBvpIbIpu 8BLURMaYFywgJQ7f/iquZxvQ+k/6U3HNXOoFfoSvJ5d7+hOCh9uFI++AupPaWwPDZevT mtWmPTw4PxCLo1+C+iHj7fDM2XjCJuPhlvGnOYmH9pnxxVKAUr7JW+JX5OmSgtCSgCwn SEe79G70Ewt9oUFwyu/OFfkyouFb+ghAoAuMbQ/PDq9b/POJcEZx1jt27MT24T3YjdCW ZrCw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="dAWNj/qA"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-64ba1d6042csor2887116a12.9.2025.12.28.07.18.32 for (Google Transport Security); Sun, 28 Dec 2025 07:18:32 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Gm-Gg: AY/fxX41vhRUpLXjm0JbGB2kNIEswIc3TIo0tebMVQSg9qwhI5nljVVjLarfj/1dAwW VmBSU8xPBD1HBsupA5h7jM/byQsmTEIog9tz+AegZ8w75a91Fz19GQ8Ei2RWuUqDYBiP9atXxB6 FePQ36ayvbNmB/7kzQ2opZ3lnyEeXZSRIHP8Od3/nPPegUCYkEb1RT5iUm7jCqbnL/lzeZ+cYRW qSWYG+1JDAjXCP48+rMzsqHWz4bGoi2lnm13NLTp7NigjhSZXPb7EWJZGuu9LM+LaqrmtIVwA/b 91N9tAlmFknVXhOsSNs5vFf/2uktgkZlvQKQZ1XOA6TyyItMbwRV3Fe79XwrecDxmMTo/g9Yo+A //PUPpR9M5gLN9gNX9QYlGWATbprTMgfop0c8YCTgLVhxQ6kSkXu79Oly0pEueDhWkwjzjEy7sF CYfCKplZdN8JlrUGfUDQ/Y5sQj3WqFmIbLPfcxObEHLjRhuEFw3bPuhntODhasgSYhIytHAZZoi eenZuZncWOrIo0F0DJaRaS+IxU3suM2izlmR1nDQc76Ql0pB4dcClRYExbeFAoWMgK8mehx2yXZ CRQlO+VsyMI= X-Received: by 2002:a05:6402:d08:b0:640:7529:b8d3 with SMTP id 4fb4d7f45d1cf-64b8eb73ab9mr22377742a12.9.1766935112424; Sun, 28 Dec 2025 07:18:32 -0800 (PST) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-95-248-31-95.retail.telecomitalia.it. [95.248.31.95]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-64b91494cd7sm28502224a12.16.2025.12.28.07.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 07:18:32 -0800 (PST) From: Dario Binacchi To: u-boot@lists.denx.de Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Michal Simek , Padmarao Begari , Sughosh Ganu , Tom Rini Subject: [PATCH 2/5] fwu: centralize bank state macros in fwu_mdata.h Date: Sun, 28 Dec 2025 16:17:52 +0100 Message-ID: <20251228151824.25667-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251228151824.25667-1-dario.binacchi@amarulasolutions.com> References: <20251228151824.25667-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="dAWNj/qA"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Move the bank state definitions to fwu_mdata.h so they live next to the structures they describe and can be consistently reused by both U-Boot code and mkfwumdata, avoiding duplication and reducing the risk of mismatched constants. Signed-off-by: Dario Binacchi --- include/fwu.h | 4 ---- include/fwu_mdata.h | 4 ++++ tools/mkfwumdata.c | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/fwu.h b/include/fwu.h index e7bd1d492af1..c9549019601c 100644 --- a/include/fwu.h +++ b/include/fwu.h @@ -80,10 +80,6 @@ struct fwu_mdata_ops { #define FWU_IMAGE_ACCEPTED 0x1 -#define FWU_BANK_INVALID (uint8_t)0xFF -#define FWU_BANK_VALID (uint8_t)0xFE -#define FWU_BANK_ACCEPTED (uint8_t)0xFC - enum { PRIMARY_PART = 1, SECONDARY_PART, diff --git a/include/fwu_mdata.h b/include/fwu_mdata.h index d2521f39b42e..43b3487c4a23 100644 --- a/include/fwu_mdata.h +++ b/include/fwu_mdata.h @@ -9,6 +9,10 @@ #include #include +#define FWU_BANK_INVALID (uint8_t)0xFF +#define FWU_BANK_VALID (uint8_t)0xFE +#define FWU_BANK_ACCEPTED (uint8_t)0xFC + /** * struct fwu_image_bank_info - firmware image information * @image_guid: Guid value of the image in this bank diff --git a/tools/mkfwumdata.c b/tools/mkfwumdata.c index fbc2067bc12d..0d1697622e6a 100644 --- a/tools/mkfwumdata.c +++ b/tools/mkfwumdata.c @@ -33,9 +33,6 @@ typedef uint64_t u64; /* version 2 supports maximum of 4 banks */ #define MAX_BANKS_V2 4 -#define BANK_INVALID (u8)0xFF -#define BANK_ACCEPTED (u8)0xFC - #include static const char *opts_short = "b:i:a:p:v:V:gh"; @@ -297,7 +294,7 @@ static void fwu_fill_version_specific_mdata(struct fwu_mdata_object *mobj) for (i = 0; i < MAX_BANKS_V2; i++) mdata->bank_state[i] = i < mobj->banks ? - BANK_ACCEPTED : BANK_INVALID; + FWU_BANK_ACCEPTED : FWU_BANK_INVALID; fw_desc = (struct fwu_fw_store_desc *)((u8 *)mdata + sizeof(*mdata)); fw_desc->num_banks = mobj->banks;