From nobody Sun Feb 8 14:56:50 2026 Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4409C329367 for ; Tue, 6 Jan 2026 16:28:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.67 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767716894; cv=none; b=IuLHV7OiC2+6R/VPPTuSUPm9JC2K05RPdMA+1MoETUnh6WePwgrPNfl6xT512Xuv3O7DzMU6MwpsY+W4nnQdQwth50fI865BNaHsAs4+ZfuJSaolzdO7lC52Ma3op3dQBOvhuLLgzSsLEItC0aJb8uJO9aJgIQAbuVbs/QDQ8Z0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767716894; c=relaxed/simple; bh=OJ5gjSQWKx5C84AvdM6xqDc/SoTZsEG7agwwRllLSl4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SbUhGDtlZgsF2eZ/roKpUp1Ks9Ob74STZDsPurDrvqLK90liifYl8D/6pQblwNt9hVaGsecSYy9GWDlAojy2UjZCFtor0+j5F6aMPq9iPPQOzU1sgvGFsuvZDrwIpKg3N21UD53pKdzl/vwY+b1AKwrCsM+fdQ1JocW6XpGOA+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=mTgtQTi8; arc=none smtp.client-ip=209.85.210.67 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="mTgtQTi8" Received: by mail-ot1-f67.google.com with SMTP id 46e09a7af769-7cdd651c884so725625a34.1 for ; Tue, 06 Jan 2026 08:28:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1767716892; x=1768321692; darn=vger.kernel.org; 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=OQo1oqJAVo44ptfZ9oLDxIXzqeCSewp3mycJJep0ovk=; b=mTgtQTi8Y4jDyI6gTLx3dwvkQoa61l77VuNXfMSRPMNmuQm9BFiYsQ6MaQUQbdJuhc Cw2Fcye9Ni7C7/q9HevZn00rvOyQqsXy+nVPZoR4HRs0GZFytHigBGZKi9oMjFXZ57tq VZN38iRC7UzoE3aAOGYOOcMZNVUBSewflthN8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767716892; x=1768321692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=OQo1oqJAVo44ptfZ9oLDxIXzqeCSewp3mycJJep0ovk=; b=t3dKjDNBnVdt5G7HD++hxDtBEY4G/T4/yoGPOgOsH0anAswBATZkxKxud6NPZtGYQs VQuZX0EyaviBGvUJZd0f3PyJf4gKoS/YeNxnfxp7cCwY3gluBbK+fB/gVxo4Xm2N94d+ NvAzPfZkczWIftC6No9A17Q7cXbUj4DNVO6N9YuLHhlzp5oeVc+7V+sC3DQtSvZW9nrw nVWpzk3hBujauTtgHh571lvofKTIGjuMrmLETTAB97om1ieWTgHMu7MgFmgWWb1q1YzG 32ToAUTYGXW32phutm4tX+/zA35y3Z/I06pK/wdVPv5CtxK9EkjMwftVsNBay0rpxqwy pXAQ== X-Forwarded-Encrypted: i=1; AJvYcCUq/gwv8v9TcPD3xddHy4am0tbO6sHH0AyGiwFvOkuaHEJInjmpRtYBSYJwtr884bwaGHPOJ4b4DiNYIo8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/2PhGODU7T5L4QlYA0aQnDlBDGO5g1Ll3tN3wMaxGGZyjZJMe OFg52lU6+x/RwuinRTiUfphaoM1M5yNunYgo95FhulW4WSCu41iv0vSmeKviMlOheQ== X-Gm-Gg: AY/fxX687Z8ZdZQz4KH6ijMlfowcsV3tLk7lVKoke8T+VCPTn1asm0n3HXE1uEyjgaM V0NysNTb0dVRJYN9R8p21U22ozE33AmGGydgxYsdkotm/vTKH0wI5rl01taXV+pnStqKbX8Refw S90Gbb173XiqWN6oJaRo9yKZ0BKWE32EHGzdSPqrb9imuqTLONMYwQLvvDbxbYMvvw9z1H8cHyH weMVPFOOZtF1IJIT3X0Za1C5HGfLtNmOMHASKKj2ZTJbVS24eUh+MSTSXQG+Bd3IDZJeAnJdbHG AEU8Sjjq6O5Uu78MI9WN7Z1gO8XkYxJn2cIUhngD/c2I+USwip5Bwp9A90ih2qCEDjFqiftmf73 DerQnsDYJNq0iD6mPxL/0okXxELrrunBvVakJr6EUggaMsq+hARRnNwLxwI+//TqKsWWu2XAs4K s6t+RD X-Google-Smtp-Source: AGHT+IGuJABBFnzvQfwuTK8ad1RpY2J0r9aGrWVcqmMOekBUx5pLw74qr+O3uLebVoUpSRypznVpqQ== X-Received: by 2002:a05:6830:4588:b0:7c7:7f85:d19 with SMTP id 46e09a7af769-7ce46cae1b1mr1464100a34.8.1767716892094; Tue, 06 Jan 2026 08:28:12 -0800 (PST) Received: from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7ce478af8b2sm1630951a34.15.2026.01.06.08.28.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 08:28:09 -0800 (PST) From: Simon Glass To: linux-arm-kernel@lists.infradead.org Cc: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , =?UTF-8?q?J=20=2E=20Neusch=C3=A4fer?= , Masahiro Yamada , Ahmad Fatoum , Nicolas Schier , Tom Rini , Chen-Yu Tsai , Simon Glass , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH v9 3/6] scripts/make_fit: Move dtb processing into a function Date: Tue, 6 Jan 2026 09:27:33 -0700 Message-ID: <20260106162738.2605574-4-sjg@chromium.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260106162738.2605574-1-sjg@chromium.org> References: <20260106162738.2605574-1-sjg@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since build_fit() is getting quite long, move the dtb processing into a separate function. Change the double quotes in the write() call to single, to match the rest of the script. Signed-off-by: Simon Glass Reviewed-by: Nicolas Schier Reviewed-by: Ahmad Fatoum Reviewed-by: Chen-Yu Tsai --- (no changes since v7) Changes in v7: - Add a note about the " -> ' change scripts/make_fit.py | 67 +++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/scripts/make_fit.py b/scripts/make_fit.py index 66cd73711506..7ddaf3c0d783 100755 --- a/scripts/make_fit.py +++ b/scripts/make_fit.py @@ -277,6 +277,47 @@ def process_dtb(fname, args): =20 return (model, compat, files) =20 + +def _process_dtbs(args, fsw, entries, fdts): + """Process all DTB files and add them to the FIT + + Args: + args: Program arguments + fsw: FIT writer object + entries: List to append entries to + fdts: Dictionary of processed DTBs + + Returns: + tuple: + Number of files processed + Total size of files processed + """ + seq =3D 0 + size =3D 0 + for fname in args.dtbs: + # Ignore non-DTB (*.dtb) files + if os.path.splitext(fname)[1] !=3D '.dtb': + continue + + try: + (model, compat, files) =3D process_dtb(fname, args) + except Exception as e: + sys.stderr.write(f'Error processing {fname}:\n') + raise e + + for fn in files: + if fn not in fdts: + seq +=3D 1 + size +=3D os.path.getsize(fn) + output_dtb(fsw, seq, fn, args.arch, args.compress) + fdts[fn] =3D seq + + files_seq =3D [fdts[fn] for fn in files] + entries.append([model, compat, files_seq]) + + return seq, size + + def build_fit(args): """Build the FIT from the provided files and arguments =20 @@ -289,7 +330,6 @@ def build_fit(args): int: Number of configurations generated size: Total uncompressed size of data """ - seq =3D 0 size =3D 0 fsw =3D libfdt.FdtSw() setup_fit(fsw, args.name) @@ -310,34 +350,15 @@ def build_fit(args): size +=3D len(data) write_ramdisk(fsw, data, args) =20 - for fname in args.dtbs: - # Ignore non-DTB (*.dtb) files - if os.path.splitext(fname)[1] !=3D '.dtb': - continue - - try: - (model, compat, files) =3D process_dtb(fname, args) - except Exception as e: - sys.stderr.write(f"Error processing {fname}:\n") - raise e - - for fn in files: - if fn not in fdts: - seq +=3D 1 - size +=3D os.path.getsize(fn) - output_dtb(fsw, seq, fn, args.arch, args.compress) - fdts[fn] =3D seq - - files_seq =3D [fdts[fn] for fn in files] - - entries.append([model, compat, files_seq]) + count, fdt_size =3D _process_dtbs(args, fsw, entries, fdts) + size +=3D fdt_size =20 finish_fit(fsw, entries, bool(args.ramdisk)) =20 # Include the kernel itself in the returned file count fdt =3D fsw.as_fdt() fdt.pack() - return fdt.as_bytearray(), seq + 1 + bool(args.ramdisk), size + return fdt.as_bytearray(), count + 1 + bool(args.ramdisk), size =20 =20 def run_make_fit(): --=20 2.43.0