ata: Migrate CONFIG_SATA_MV to Kconfig

Signed-off-by: Tuomas Tynkkynen <[email protected]>

diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 23eaa123a2fdf2201440cfa7153145e99deb3ed3..6724af04bc2616370f8b153253a6f5a2271a25b0 100644 (file)
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -37,6 +37,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SATA_MV=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_PXA3XX=y

diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 863d6ce3d0bcc091cf540bb21e4402403d9a5de0..f602c839c314625f8329131fd0312d7a693d7b2e 100644 (file)
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -42,6 +42,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SATA_MV=y
 CONFIG_FPGA_ALTERA=y
 CONFIG_DM_GPIO=y
 # CONFIG_MMC is not set

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 77e0fbb217d2d98f9faf79ad9441c621a930a372..8dfa4670cc9d3c419831903056217ccb9af9921a 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -47,6 +47,12 @@ config DWC_AHCI
          Enable this driver to support Sata devices through
          Synopsys DWC AHCI module.
 
+config SATA_MV
+       bool "Enable Marvell SATA controller driver support"
+       help
+         Enable this driver to support the SATA controller found in
+         some Marvell SoCs.
+
 config SATA_SIL
        bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support"
        help

diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 4a5be6188f1131da6e4de0ca525520c0f80b158b..105578ffc6dae74b0f6182fd1aaf3933193b7afa 100644 (file)
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -49,7 +49,6 @@
 
 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE     2
-#define CONFIG_SATA_MV
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
 

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index a7001e76aaac672bb844f006c6ee603af0c00e9d..774324f28b5dc395be524ce7335efa7cad70b088 100644 (file)
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -65,7 +65,6 @@
 
 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE     1
-#define CONFIG_SATA_MV
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index dc69c191c0efae86b119425bb13a275d1bebd174..cfc173b03a32b6df63f35371ff9f63f0d857700b 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1903,7 +1903,6 @@ CONFIG_SAR2_REG
 CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
-CONFIG_SATA_MV
 CONFIG_SATA_ULI5288
 CONFIG_SBC8349
 CONFIG_SBC8548