[U-Boot] [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.
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org --- Kconfig | 6 ++++++ README | 2 +- common/image-fit.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Kconfig b/Kconfig index 9fd9de1772..7d9e971f0e 100644 --- a/Kconfig +++ b/Kconfig @@ -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 diff --git a/README b/README index a62aee1619..672049495b 100644 --- a/README +++ b/README @@ -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 diff --git a/common/image-fit.c b/common/image-fit.c index 5b93dceae1..578db5cc84 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -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
These functions may be needed in SPL, so add empty variants of them if CONFIG_SPL_FIT_PRINT is disabled.
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org --- common/image-fit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/image-fit.c b/common/image-fit.c index 578db5cc84..98cb039376 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -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) */
/**
On 13 May 2018 at 08:22, Marek Vasut marex@denx.de wrote:
These functions may be needed in SPL, so add empty variants of them if CONFIG_SPL_FIT_PRINT is disabled.
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org
common/image-fit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Sun, May 13, 2018 at 12:22:53AM +0200, Marek Vasut wrote:
These functions may be needed in SPL, so add empty variants of them if CONFIG_SPL_FIT_PRINT is disabled.
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
Just add IH_TYPE_STANDALONE to fit_get_image_type_property().
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org --- common/image-fit.c | 2 ++ include/image.h | 1 + 2 files changed, 3 insertions(+)
diff --git a/common/image-fit.c b/common/image-fit.c index 98cb039376..32e343122e 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -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"; diff --git a/include/image.h b/include/image.h index df701e3470..6e5750333a 100644 --- a/include/image.h +++ b/include/image.h @@ -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
On 13 May 2018 at 08:22, Marek Vasut marex@denx.de wrote:
Just add IH_TYPE_STANDALONE to fit_get_image_type_property().
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org
common/image-fit.c | 2 ++ include/image.h | 1 + 2 files changed, 3 insertions(+)
Reviewed-by: Simon Glass sjg@chromium.org
On Sun, May 13, 2018 at 12:22:54AM +0200, Marek Vasut wrote:
Just add IH_TYPE_STANDALONE to fit_get_image_type_property().
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
On 13 May 2018 at 08:22, Marek Vasut marex@denx.de wrote:
Rename CONFIG_FIT_SPL_PRINT to CONFIG_SPL_FIT_PRINT and add Kconfig entry for it.
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org
Kconfig | 6 ++++++ README | 2 +- common/image-fit.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Sun, May 13, 2018 at 12:22:52AM +0200, Marek Vasut wrote:
Rename CONFIG_FIT_SPL_PRINT to CONFIG_SPL_FIT_PRINT and add Kconfig entry for it.
Signed-off-by: Marek Vasut marex@denx.de Cc: Pantelis Antoniou pantelis.antoniou@konsulko.com Cc: Simon Glass sjg@chromium.org Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
participants (3)
-
Marek Vasut -
Simon Glass -
Tom Rini