]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
spl: sata: don't force FS_FAT support
authorBaruch Siach <baruch@tkos.co.il>
Thu, 16 May 2019 10:03:55 +0000 (13:03 +0300)
committerStefan Roese <sr@denx.de>
Thu, 11 Jul 2019 05:01:18 +0000 (07:01 +0200)
Allow the code to build when FS_FAT is not enabled, and thus
spl_load_image_fat() is not provided.

A subsequent patch should add alternative raw access U-Boot main image
load method.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
common/spl/spl_sata.c

index 2fb46108a5127c7017037e01f49a6130f5308ef8..f0af9f38d19f0c216fce0f067838a7fde388db33 100644 (file)
@@ -53,9 +53,13 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
                                  CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
 #endif
        {
-               err = spl_load_image_fat(spl_image, stor_dev,
+               err = -ENOSYS;
+
+               if (IS_ENABLED(CONFIG_SPL_FS_FAT)) {
+                       err = spl_load_image_fat(spl_image, stor_dev,
                                        CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
-                               CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+                                       CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+               }
        }
        if (err) {
                puts("Error loading sata device\n");