spl: Migrate SYS_SATA_FAT_BOOT_PARTITION to Kconfig

This moves SYS_SATA_FAT_BOOT_PARTITION to Kconfig and enforces the
current default via Kconfig rather than C code.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index fef01bdd7daa838f9ed2f393e98737ee47d76e02..c6da4a403e984685a3d2517042485ff4fb325a21 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1232,6 +1232,11 @@ config SPL_SATA
          expense and power consumption. This enables loading from SATA
          using a configured device.
 
+config SYS_SATA_FAT_BOOT_PARTITION
+       int "Partition on the SATA disk to load U-Boot from"
+       depends on SPL_SATA && SPL_FS_FAT
+       default 1
+
 config SPL_SATA_RAW_U_BOOT_USE_SECTOR
        bool "SATA raw mode: by sector"
        depends on SPL_SATA

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 9ae02730685aa0e4edf7db664b6f9589514c0786..12397f0ae17e8cae86b1d3deb28a99050cecba1d 100644 (file)
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -17,10 +17,6 @@
 #include <fat.h>
 #include <image.h>
 
-#ifndef CONFIG_SYS_SATA_FAT_BOOT_PARTITION
-#define CONFIG_SYS_SATA_FAT_BOOT_PARTITION     1
-#endif
-
 #ifndef CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR
 /* Dummy value to make the compiler happy */
 #define CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR 0x100

diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
index 3afe418b67dc92b35e2a8ff36ec65e070d02f8fe..f34988fdd74ced5abfe34a31a582d29a855a9dd5 100644 (file)
--- a/include/configs/imx6_spl.h
+++ b/include/configs/imx6_spl.h
@@ -10,11 +10,6 @@
 
 /* MMC support */
 
-/* SATA support */
-#if defined(CONFIG_SPL_SATA)
-#define CONFIG_SYS_SATA_FAT_BOOT_PARTITION     1
-#endif
-
 #endif
 
 #endif