diff mbox series

[Concept,27/30] fit: Add a helper for address printing

Message ID	20251120025614.2215587-28-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Wed, 19 Nov 2025 19:56:02 -0700 Message-ID: <20251120025614.2215587-28-sjg@u-boot.org> In-Reply-To: <20251120025614.2215587-1-sjg@u-boot.org> References: <20251120025614.2215587-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: QYYAHQTDR75FY5MDCSEAIXO2X5UHQQHM CC: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <simon.glass@canonical.com>, Claude <noreply@anthropic.com> Precedence: list Subject: [Concept] [PATCH 27/30] fit: Add a helper for address printing Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/QYYAHQTDR75FY5MDCSEAIXO2X5UHQQHM/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	fit: Improve and test the code to print FIT info \| [Concept,00/30] fit: Improve and test the code to print FIT info [Concept,01/30] docs: Merge .claude/README.md into CLAUDE.md [Concept,02/30] tools: Fix debug() to avoid unused-variable warnings [Concept,03/30] test: Increase expect_str/actual_str buffer size [Concept,04/30] fit: Remove unused len parameter from fit_get_name() [Concept,05/30] test: Add a test for FIT image printing [Concept,06/30] test: Add signature-testing to the FIT-printing test [Concept,07/30] test: fit: Test printing a FIT with multiple FDTs [Concept,08/30] test: fit: Test the remaining features and edge cases [Concept,09/30] test: fit: Add test for missing FIT description [Concept,10/30] test: fit: Add pytest for mkimage output [Concept,11/30] fit: Refactor fit_print_contents() to use new fit_print() [Concept,12/30] fit: Move printing code to its own file [Concept,13/30] fit: Drop showing an unused 'required' property [Concept,14/30] fit: Add a context struct for FIT-printing [Concept,15/30] fit: Put the indent string into print context [Concept,16/30] fit: Create some helpers for printing [Concept,17/30] fit: Use emit_label() helper in fit_image_print() [Concept,18/30] fit: Use emit_label() helper in fit_conf_print() [Concept,19/30] fit: Add a a function to print labels with values [Concept,20/30] fit: Change indent from string to int [Concept,21/30] fit: Move values one column to the right [Concept,22/30] fit: Use emit_label_val() where possible [Concept,23/30] fit: Add a helper to output optional properties [Concept,24/30] fit: Add a helper for timestamp printing [Concept,25/30] fit: Add a helper for stringlist properties [Concept,26/30] fit: Add a helper for printing descriptions [Concept,27/30] fit: Add a helper for address printing [Concept,28/30] fit: Use a boolean to simplify type checks [Concept,29/30] fit: Add a helper to iterate through hash/signature nodes [Concept,30/30] fit: Use the libfdt subnode iterator

Commit Message

Simon Glass Nov. 20, 2025, 2:56 a.m. UTC

  From: Simon Glass <simon.glass@canonical.com>

Add emit_addr() to handle printing load an entry addresses.

The helper takes a 'valid' boolean parameter to determine whether to
print the address value or 'unavailable'.

Combine the two separate if() blocks for the load address.

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 boot/fit_print.c | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff mbox series

Patch

diff --git a/boot/fit_print.c b/boot/fit_print.c
index 069afbe8567..70199a34c18 100644
--- a/boot/fit_print.c
+++ b/boot/fit_print.c
@@ -179,6 +179,26 @@  static void emit_desc(struct fit_print_ctx *ctx, int noffset,
 	emit_label_val(ctx, label, ret ? "unavailable" : desc);
 }
 
+/**
+ * emit_addr() - print an address property
+ * @ctx: pointer to FIT print context
+ * @label: label string to use when printing
+ * @addr: address value to print
+ * @valid: true if the address is valid, false to print "unavailable"
+ *
+ * Prints an address with the given label. If valid is false, prints
+ * "unavailable" instead of the address value.
+ */
+static void emit_addr(struct fit_print_ctx *ctx, const char *label, ulong addr,
+		      bool valid)
+{
+	emit_label(ctx, label);
+	if (valid)
+		printf("0x%08lx\n", addr);
+	else
+		printf("unavailable\n");
+}
+
 /**
  * fit_image_print_data() - prints out the hash node details
  * @ctx: pointer to FIT print context
@@ -335,30 +355,16 @@  void fit_image_print(struct fit_print_ctx *ctx, int image_noffset)
 
 	if (type == IH_TYPE_KERNEL || type == IH_TYPE_STANDALONE ||
 	    type == IH_TYPE_FIRMWARE || type == IH_TYPE_RAMDISK ||
-	    type == IH_TYPE_FPGA) {
+	    type == IH_TYPE_FPGA || type == IH_TYPE_FLATDT) {
 		ret = fit_image_get_load(fit, image_noffset, &load);
-		emit_label(ctx, "Load Address");
-		if (ret)
-			printf("unavailable\n");
-		else
-			printf("0x%08lx\n", load);
-	}
-
-	/* optional load address for FDT */
-	if (type == IH_TYPE_FLATDT &&
-	    !fit_image_get_load(fit, image_noffset, &load)) {
-		emit_label(ctx, "Load Address");
-		printf("0x%08lx\n", load);
+		if ((type != IH_TYPE_FLATDT) || !ret)
+			emit_addr(ctx, "Load Address", load, !ret);
 	}
 
 	if (type == IH_TYPE_KERNEL || type == IH_TYPE_STANDALONE ||
 	    type == IH_TYPE_RAMDISK) {
 		ret = fit_image_get_entry(fit, image_noffset, &entry);
-		emit_label(ctx, "Entry Point");
-		if (ret)
-			printf("unavailable\n");
-		else
-			printf("0x%08lx\n", entry);
+		emit_addr(ctx, "Entry Point", entry, !ret);
 	}
 
 	/* Process all hash subnodes of the component image node */