]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
boot/image-board.c: boot_get_fpga(): pass compatible flag to fpga_load()
authorPeter Korsgaard <peter@korsgaard.com>
Tue, 5 Nov 2024 16:21:36 +0000 (17:21 +0100)
committerMichal Simek <michal.simek@amd.com>
Fri, 15 Nov 2024 13:32:47 +0000 (14:32 +0100)
For E.G. signed FPGA bitstreams, similar to how it is done for the FPGA
loading from SPL since commit 71f1a5392aad ("spl: fit: pass real compatible
flags to fpga_load()").

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Link: https://lore.kernel.org/r/20241105162136.839633-1-peter@korsgaard.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
boot/image-board.c

index 1757e5816d84de89ff7be95c42fa8115ebb8d887..b726bd6b30358a4c676c35a18bd18032027c26f3 100644 (file)
@@ -624,9 +624,10 @@ int boot_get_fpga(struct bootm_headers *images)
        void *buf;
        int conf_noffset;
        int fit_img_result;
-       const char *uname, *name;
+       const char *uname, *name, *compatible;
        int err;
        int devnum = 0; /* TODO support multi fpga platforms */
+       int flags = 0;
 
        if (!IS_ENABLED(CONFIG_FPGA))
                return -ENOSYS;
@@ -674,20 +675,29 @@ int boot_get_fpga(struct bootm_headers *images)
                        return fit_img_result;
                }
 
+               conf_noffset = fit_image_get_node(buf, uname);
+               compatible = fdt_getprop(buf, conf_noffset, "compatible", NULL);
+               if (!compatible) {
+                       printf("'fpga' image without 'compatible' property\n");
+               } else {
+                       if (CONFIG_IS_ENABLED(FPGA_LOAD_SECURE))
+                               flags = fpga_compatible2flag(devnum, compatible);
+               }
+
                if (!fpga_is_partial_data(devnum, img_len)) {
                        name = "full";
                        err = fpga_loadbitstream(devnum, (char *)img_data,
                                                 img_len, BIT_FULL);
                        if (err)
                                err = fpga_load(devnum, (const void *)img_data,
-                                               img_len, BIT_FULL, 0);
+                                               img_len, BIT_FULL, flags);
                } else {
                        name = "partial";
                        err = fpga_loadbitstream(devnum, (char *)img_data,
                                                 img_len, BIT_PARTIAL);
                        if (err)
                                err = fpga_load(devnum, (const void *)img_data,
-                                               img_len, BIT_PARTIAL, 0);
+                                               img_len, BIT_PARTIAL, flags);
                }
 
                if (err)