configs: Migrate CONFIG_FMAN_ENET and some related options to Kconfig

[platform/kernel/u-boot.git] / common / image-fit.c

diff --git a/common/image-fit.c b/common/image-fit.c
index 8d39a24..a74b44f 100644 (file)
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -165,6 +165,7 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
        uint8_t *value;
        int value_len;
        char *algo;
+       const char *padding;
        int required;
        int ret, i;
 
@@ -184,6 +185,10 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p,
                printf(" (required)");
        printf("\n");
 
+       padding = fdt_getprop(fit, noffset, "padding", NULL);
+       if (padding)
+               printf("%s  %s padding: %s\n", p, type, padding);
+
        ret = fit_image_hash_get_value(fit, noffset, &value,
                                       &value_len);
        printf("%s  %s value:   ", p, type);
@@ -2113,6 +2118,18 @@ int boot_get_fdt_fit(bootm_headers_t *images, ulong addr,
                        if (next_config)
                                *next_config++ = '\0';
                        uname = NULL;
+
+                       /*
+                        * fit_image_load() would load the first FDT from the
+                        * extra config only when uconfig is specified.
+                        * Check if the extra config contains multiple FDTs and
+                        * if so, load them.
+                        */
+                       cfg_noffset = fit_conf_get_node(fit, uconfig);
+
+                       i = 0;
+                       count = fit_conf_get_prop_node_count(fit, cfg_noffset,
+                                                            FIT_FDT_PROP);
                }
 
                debug("%d: using uname=%s uconfig=%s\n", i, uname, uconfig);