Skip to contentSkip to conversation

fit: Fix CONFIG_FIT_SPL_PRINT

PATCH New Marek Vasut 3 participants 9 messages May 12, 2018 – May 24, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 fit: Fix CONFIG_FIT_SPL_PRINT

Rename CONFIG_FIT_SPL_PRINT to CONFIG_SPL_FIT_PRINT and add Kconfig entry for it.

Cc Pantelis Antoniou <[email protected]>
Cc Simon Glass <[email protected]>
---
 Kconfig            | 6 ++++++
 README             | 2 +-
 common/image-fit.c | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
Kconfig +6 -0
index 9fd9de1772..7d9e971f0e 100644
@@ -305,6 +305,12 @@ config SPL_FIT
 	depends on SPL
 	select SPL_OF_LIBFDT
 
+config SPL_FIT_PRINT
+	bool "Support FIT printing within SPL"
+	depends on SPL_FIT
+	help
+	  Support printing the content of the fitImage in a verbose manner in SPL.
+
 config SPL_FIT_SIGNATURE
 	bool "Enable signature verification of FIT firmware within SPL"
 	depends on SPL_DM
README +1 -1
index a62aee1619..672049495b 100644
@@ -2695,7 +2695,7 @@ FIT uImage format:
 		use an arch-specific makefile fragment instead, for
 		example if more than one image needs to be produced.
 
-		CONFIG_FIT_SPL_PRINT
+		CONFIG_SPL_FIT_PRINT
 		Printing information about a FIT image adds quite a bit of
 		code to SPL. So this is normally disabled in SPL. Use this
 		option to re-enable it. This will affect the output of the
common/image-fit.c +2 -2
index 5b93dceae1..578db5cc84 100644
@@ -142,7 +142,7 @@ int fit_get_subimage_count(const void *fit, int images_noffset)
 	return count;
 }
 
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_FIT_SPL_PRINT)
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_FIT_PRINT)
 /**
  * fit_print_contents - prints out the contents of the FIT format image
  * @fit: pointer to the FIT format image header
@@ -460,7 +460,7 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
 	}
 }
 
-#endif /* !defined(CONFIG_SPL_BUILD) || defined(CONFIG_FIT_SPL_PRINT) */
+#endif /* !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_FIT_PRINT) */
 
 /**
  * fit_get_desc - get node description property
Signature · 1 line
2.16.2
#1 lore raw

PATCH 2/3 fit: Add empty fit_print_contents() and fit_image_print()

These functions may be needed in SPL, so add empty variants of them if CONFIG_SPL_FIT_PRINT is disabled.

Cc Pantelis Antoniou <[email protected]>
Cc Simon Glass <[email protected]>
---
 common/image-fit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
common/image-fit.c +3 -1
index 578db5cc84..98cb039376 100644
@@ -459,7 +459,9 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
 		}
 	}
 }
-
+#else
+void fit_print_contents(const void *fit) { }
+void fit_image_print(const void *fit, int image_noffset, const char *p) { }
 #endif /* !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_FIT_PRINT) */
 
 /**
Signature · 1 line
2.16.2
#3 lore raw

PATCH 2/3 fit: Add empty fit_print_contents() and fit_image_print()

In reply to Marek Vasut
Quoted 7 lines · Marek Vasut

These functions may be needed in SPL, so add empty variants of them if CONFIG_SPL_FIT_PRINT is disabled.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180524/fdab8ec3/attachment.sig>
#4 lore raw

PATCH 3/3 fit: Add standalone image type handling

In reply to Marek Vasut

Just add IH_TYPE_STANDALONE to fit_get_image_type_property().

Cc Pantelis Antoniou <[email protected]>
Cc Simon Glass <[email protected]>
---
 common/image-fit.c | 2 ++
 include/image.h    | 1 +
 2 files changed, 3 insertions(+)
common/image-fit.c +2 -0
index 98cb039376..32e343122e 100644
@@ -1728,6 +1728,8 @@ static const char *fit_get_image_type_property(int type)
 		return FIT_LOADABLE_PROP;
 	case IH_TYPE_FPGA:
 		return FIT_FPGA_PROP;
+	case IH_TYPE_STANDALONE:
+		return FIT_STANDALONE_PROP;
 	}
 
 	return "unknown";
include/image.h +1 -0
index df701e3470..6e5750333a 100644
@@ -922,6 +922,7 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size);
 #define FIT_SETUP_PROP		"setup"
 #define FIT_FPGA_PROP		"fpga"
 #define FIT_FIRMWARE_PROP	"firmware"
+#define FIT_STANDALONE_PROP	"standalone"
 
 #define FIT_MAX_HASH_LEN	HASH_MAX_DIGEST_SIZE
 
Signature · 1 line
2.16.2
#6 lore raw

PATCH 3/3 fit: Add standalone image type handling

In reply to Marek Vasut
Quoted 6 lines · Marek Vasut

Just add IH_TYPE_STANDALONE to fit_get_image_type_property().

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180524/dfade614/attachment.sig>
#7 lore raw

PATCH 1/3 fit: Fix CONFIG_FIT_SPL_PRINT

In reply to Marek Vasut
Quoted 12 lines · Marek Vasut

Rename CONFIG_FIT_SPL_PRINT to CONFIG_SPL_FIT_PRINT and add Kconfig entry for it.

Cc Pantelis Antoniou <[email protected]>
Cc Simon Glass <[email protected]>
---
 Kconfig            | 6 ++++++
 README             | 2 +-
 common/image-fit.c | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
#8 lore raw

PATCH 1/3 fit: Fix CONFIG_FIT_SPL_PRINT

In reply to Marek Vasut
Quoted 7 lines · Marek Vasut

Rename CONFIG_FIT_SPL_PRINT to CONFIG_SPL_FIT_PRINT and add Kconfig entry for it.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180524/051cb426/attachment.sig>