summaryrefslogtreecommitdiffstats
path: root/common/image-fit.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-02-22 22:55:43 -0700
committerTom Rini <trini@konsulko.com>2016-03-14 19:18:07 -0400
commit73223f0e1bd0e37925ae1b7f21b51733145571dc (patch)
tree3c2da91d78af13cbc1f9778e01bf4bc6a3efffcc /common/image-fit.c
parent69e173eb57d1f4848f070c83456096ba5d2ba1b4 (diff)
downloadtalos-obmc-uboot-73223f0e1bd0e37925ae1b7f21b51733145571dc.tar.gz
talos-obmc-uboot-73223f0e1bd0e37925ae1b7f21b51733145571dc.zip
Kconfig: Move CONFIG_FIT and related options to Kconfig
There are already two FIT options in Kconfig but the CONFIG options are still in the header files. We need to do a proper move to fix this. Move these options to Kconfig and tidy up board configuration: CONFIG_FIT CONFIG_OF_BOARD_SETUP CONFIG_OF_SYSTEM_SETUP CONFIG_FIT_SIGNATURE CONFIG_FIT_BEST_MATCH CONFIG_FIT_VERBOSE CONFIG_OF_STDOUT_VIA_ALIAS CONFIG_RSA Unfortunately the first one is a little complicated. We need to make sure this option is not enabled in SPL by this change. Also this option is enabled automatically in the host builds by defining CONFIG_FIT in the image.h file. To solve this, add a new IMAGE_USE_FIT #define which can be used in files that are built on the host but must also build for U-Boot and SPL. Note: Masahiro's moveconfig.py script is amazing. Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Add microblaze change, various configs/ re-applies] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/image-fit.c')
-rw-r--r--common/image-fit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/image-fit.c b/common/image-fit.c
index fbd9e0d770..f3b8aacf39 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -1101,8 +1101,9 @@ int fit_all_image_verify(const void *fit)
* Direct child node of the images parent node,
* i.e. component image node.
*/
- printf(" Hash(es) for Image %u (%s): ", count++,
+ printf(" Hash(es) for Image %u (%s): ", count,
fit_get_name(fit, noffset, NULL));
+ count++;
if (!fit_image_verify(fit, noffset))
return 0;
OpenPOWER on IntegriCloud