global: Move remaining CONFIG_SYS_* to CFG_SYS_*

[platform/kernel/u-boot.git] / common / spl / spl_fit.c

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 774072b..08da7fe 100644 (file)
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -10,7 +10,7 @@
 #include <gzip.h>
 #include <image.h>
 #include <log.h>
-#include <malloc.h>
+#include <memalign.h>
 #include <mapmem.h>
 #include <spl.h>
 #include <sysinfo.h>
@@ -321,7 +321,8 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
        if (CONFIG_IS_ENABLED(FIT_SIGNATURE)) {
                printf("## Checking hash(es) for Image %s ... ",
                       fit_get_name(fit, node, NULL));
-               if (!fit_image_verify_with_data(fit, node, src, length))
+               if (!fit_image_verify_with_data(fit, node, gd_fdt_blob(), src,
+                                               length))
                        return -EPERM;
                puts("OK\n");
        }
@@ -428,7 +429,9 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
                                 * depending on how the overlay is stored, so
                                 * don't fail yet if the allocation failed.
                                 */
-                               tmpbuffer = malloc(CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ);
+                               size_t size = CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ;
+
+                               tmpbuffer = malloc_cache_aligned(size);
                                if (!tmpbuffer)
                                        debug("%s: unable to allocate space for overlays\n",
                                              __func__);
@@ -536,7 +539,7 @@ static void *spl_get_fit_load_buffer(size_t size)
 {
        void *buf;
 
-       buf = malloc(size);
+       buf = malloc_cache_aligned(size);
        if (!buf) {
                pr_err("Could not get FIT buffer of %lu bytes\n", (ulong)size);
                pr_err("\tcheck CONFIG_SYS_SPL_MALLOC_SIZE\n");
@@ -580,18 +583,25 @@ static int spl_fit_upload_fpga(struct spl_fit_info *ctx, int node,
 {
        const char *compatible;
        int ret;
+       int devnum = 0;
+       int flags = 0;
 
        debug("FPGA bitstream at: %x, size: %x\n",
              (u32)fpga_image->load_addr, fpga_image->size);
 
        compatible = fdt_getprop(ctx->fit, node, "compatible", NULL);
-       if (!compatible)
+       if (!compatible) {
                warn_deprecated("'fpga' image without 'compatible' property");
-       else if (strcmp(compatible, "u-boot,fpga-legacy"))
-               printf("Ignoring compatible = %s property\n", compatible);
+       } else {
+               if (CONFIG_IS_ENABLED(FPGA_LOAD_SECURE))
+                       flags = fpga_compatible2flag(devnum, compatible);
+               if (strcmp(compatible, "u-boot,fpga-legacy"))
+                       debug("Ignoring compatible = %s property\n",
+                             compatible);
+       }
 
-       ret = fpga_load(0, (void *)fpga_image->load_addr, fpga_image->size,
-                       BIT_FULL);
+       ret = fpga_load(devnum, (void *)fpga_image->load_addr,
+                       fpga_image->size, BIT_FULL, flags);
        if (ret) {
                printf("%s: Cannot load the image to the FPGA\n", __func__);
                return ret;
@@ -818,7 +828,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
        }
 
        /*
-        * If a platform does not provide CONFIG_SYS_UBOOT_START, U-Boot's
+        * If a platform does not provide CFG_SYS_UBOOT_START, U-Boot's
         * Makefile will set it to 0 and it will end up as the entry point
         * here. What it actually means is: use the load address.
         */