ata: Migrate CONFIG_SATA_SIL3114 to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>

diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig
index 0893c4ac026077a3b09adb9e174612e3b40096bf..c95cec698af9d94286f304c9da5a0d27c1f8a3ab 100644 (file)
--- a/configs/MPC8349ITX_LOWBOOT_defconfig
+++ b/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 a/configs/MPC8349ITX_defconfig b/configs/MPC8349ITX_defconfig
index 8a8f05544f2fdd395d51cd842f1e898b70b680d6..4403bc0d62ccdcd8a6427d1a466931ee5769d375 100644 (file)
--- a/configs/MPC8349ITX_defconfig
+++ b/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 a/configs/TWR-P1025_defconfig b/configs/TWR-P1025_defconfig
index 5dda2bbdb5282f0c59994e866569d087c21d65b2..1eedd3c21fd4db1d7b3e2eedf7ecab5f0a9c6827 100644 (file)
--- a/configs/TWR-P1025_defconfig
+++ b/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 a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 617c80f01158089173b045364fa89046dcf0ba32..77e0fbb217d2d98f9faf79ad9441c621a930a372 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/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 a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index d06d4a28170f4be171abb10f0e3b080f33fc8e87..23fe158f747de6b093d190cb65a9499a59a42fee 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/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 a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index e9692048d14cf6c715da1333e203bdf2d3aa282f..5edf07197fb92a51d9b4e6e294e3dc38249e08ca 100644 (file)
--- a/include/configs/p1_twr.h
+++ b/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 a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 53f0857d739b3644c73543acc60b41f317e87048..dc69c191c0efae86b119425bb13a275d1bebd174 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1904,7 +1904,6 @@ CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
 CONFIG_SATA_MV
-CONFIG_SATA_SIL3114
 CONFIG_SATA_ULI5288
 CONFIG_SBC8349
 CONFIG_SBC8548