From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 16 May 2019 10:03:55 +0000 (+0300)
Subject: spl: sata: don't force FS_FAT support
X-Git-Tag: v2019.10-rc1~33^2~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=760ef309cb63a3e22ebeecb9080f1034be1560f5;p=oweals%2Fu-boot.git

spl: sata: don't force FS_FAT support

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>
---

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 2fb46108a5..f0af9f38d1 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -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");