aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-12-08 15:36:16 +0200
committerTom Rini <trini@konsulko.com>2017-12-12 14:05:48 -0500
commitad0ac54361128c60b5e7012a2b7bf38061bdc25e (patch)
treed1069452e376ea66ab6d5ee8b147d4063dd17d1b
parent32f0398ba559408e4effa2372697a0cc4d189756 (diff)
downloadu-boot-ad0ac54361128c60b5e7012a2b7bf38061bdc25e.zip
u-boot-ad0ac54361128c60b5e7012a2b7bf38061bdc25e.tar.gz
u-boot-ad0ac54361128c60b5e7012a2b7bf38061bdc25e.tar.bz2
ata: Migrate CONFIG_SATA_MV to Kconfig
Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
-rw-r--r--configs/db-mv784mp-gp_defconfig1
-rw-r--r--configs/theadorable_debug_defconfig1
-rw-r--r--drivers/ata/Kconfig6
-rw-r--r--include/configs/db-mv784mp-gp.h1
-rw-r--r--include/configs/theadorable.h1
-rw-r--r--scripts/config_whitelist.txt1
6 files changed, 8 insertions, 3 deletions
diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 23eaa12..6724af0 100644
--- 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 863d6ce..f602c83 100644
--- 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 77e0fbb..8dfa467 100644
--- 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 4a5be61..105578f 100644
--- 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 a7001e7..774324f 100644
--- 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 dc69c19..cfc173b 100644
--- 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