summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-02-02 09:24:10 -0500
committerTom Rini <trini@konsulko.com>2021-02-02 09:24:10 -0500
commitfdcb93e1709ab1a2ebb562455621617c29e2099c (patch)
tree7e81a83f46b79862c37614596e0074334269b0b1 /common
parent1aa9c3b9308763f9b1d3e31a02276baf98245945 (diff)
parentaa8544e0d16ffed53597a99883e0eb1f17818f48 (diff)
Merge branch '2021-02-01-assorted-fixes'
- Assorted fixes
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig.boot6
-rw-r--r--common/image-fit.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/common/Kconfig.boot b/common/Kconfig.boot
index 4525a12ab47..5eaabdfc27f 100644
--- a/common/Kconfig.boot
+++ b/common/Kconfig.boot
@@ -140,6 +140,12 @@ config FIT_IMAGE_POST_PROCESS
injected into the FIT creation (i.e. the blobs would have been pre-
processed before being added to the FIT image).
+config FIT_PRINT
+ bool "Support FIT printing"
+ default y
+ help
+ Support printing the content of the fitImage in a verbose manner.
+
if SPL
config SPL_FIT
diff --git a/common/image-fit.c b/common/image-fit.c
index 8660c3fd819..33210ef3c03 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -162,7 +162,7 @@ int fit_get_subimage_count(const void *fit, int images_noffset)
return count;
}
-#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_FIT_PRINT)
+#if CONFIG_IS_ENABLED(FIT_PRINT) || CONFIG_IS_ENABLED(SPL_FIT_PRINT)
/**
* fit_image_print_data() - prints out the hash node details
* @fit: pointer to the FIT format image header
@@ -570,7 +570,7 @@ 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) */
+#endif /* CONFIG_IS_ENABLED(FIR_PRINT) || CONFIG_IS_ENABLED(SPL_FIT_PRINT) */
/**
* fit_get_desc - get node description property