[U-Boot] [PATCH 04/10] ata: Migrate CONFIG_SATA_SIL3114 to Kconfig

[Tuomas Tynkkynen]

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen at iki.fi>
---
 configs/MPC8349ITX_LOWBOOT_defconfig | 1 +
 configs/MPC8349ITX_defconfig         | 1 +
 configs/TWR-P1025_defconfig          | 1 +
 drivers/ata/Kconfig                  | 5 +++++
 include/configs/MPC8349ITX.h         | 1 -
 include/configs/p1_twr.h             | 1 -
 scripts/config_whitelist.txt         | 1 -
 7 files changed, 8 insertions(+), 3 deletions(-)

diff --git configs/MPC8349ITX_LOWBOOT_defconfig configs/MPC8349ITX_LOWBOOT_defconfig
index 0893c4ac02..c95cec698a 100644
--- configs/MPC8349ITX_LOWBOOT_defconfig
+++ configs/MPC8349ITX_LOWBOOT_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_SATA_SIL3114=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
diff --git configs/MPC8349ITX_defconfig configs/MPC8349ITX_defconfig
index 8a8f05544f..4403bc0d62 100644
--- configs/MPC8349ITX_defconfig
+++ configs/MPC8349ITX_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_SATA_SIL3114=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
diff --git configs/TWR-P1025_defconfig configs/TWR-P1025_defconfig
index 5dda2bbdb5..1eedd3c21f 100644
--- configs/TWR-P1025_defconfig
+++ configs/TWR-P1025_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=ec000000.nor"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:256k(vsc7385-firmware),256k(dtb),5632k(kernel),57856k(fs),256k(qe-ucode-firmware),1280k(u-boot)"
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_SATA_SIL3114=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
diff --git drivers/ata/Kconfig drivers/ata/Kconfig
index 617c80f011..77e0fbb217 100644
--- drivers/ata/Kconfig
+++ drivers/ata/Kconfig
@@ -53,4 +53,9 @@ config SATA_SIL
 	  Enable this driver to support the SIL3131, SIL3132 and SIL3124
 	  SATA controllers.
 
+config SATA_SIL3114
+	bool "Enable Silicon Image SIL3114 SATA driver support"
+	help
+	  Enable this driver to support the SIL3114 SATA controllers.
+
 endmenu
diff --git include/configs/MPC8349ITX.h include/configs/MPC8349ITX.h
index d06d4a2817..23fe158f74 100644
--- include/configs/MPC8349ITX.h
+++ include/configs/MPC8349ITX.h
@@ -67,7 +67,6 @@
 /* The CF card interface on the back of the board */
 #define CONFIG_COMPACT_FLASH
 #define CONFIG_VSC7385_ENET	/* VSC7385 ethernet support */
-#define CONFIG_SATA_SIL3114	/* SIL3114 SATA controller */
 #define CONFIG_SYS_USB_HOST	/* use the EHCI USB controller */
 #endif
 
diff --git include/configs/p1_twr.h include/configs/p1_twr.h
index e9692048d1..5edf07197f 100644
--- include/configs/p1_twr.h
+++ include/configs/p1_twr.h
@@ -50,7 +50,6 @@
 #define CONFIG_TSEC_ENET	/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_SATA_SIL3114
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
diff --git scripts/config_whitelist.txt scripts/config_whitelist.txt
index 416b6e2aa5..625f610a16 100644
--- scripts/config_whitelist.txt
+++ scripts/config_whitelist.txt
@@ -1905,7 +1905,6 @@ CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
 CONFIG_SATA_MV
-CONFIG_SATA_SIL3114
 CONFIG_SATA_ULI5288
 CONFIG_SBC8349
 CONFIG_SBC8548
-- 
2.15.0