diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-12-08 15:36:15 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-12 14:05:48 -0500 |
| commit | 32f0398ba559408e4effa2372697a0cc4d189756 (patch) | |
| tree | f79ca91b10cc0630fcf9349a9bef661bd5d221aa | |
| parent | c88ecf47bdcd0af21b23a3317116bcd956f1e775 (diff) | |
| download | u-boot-32f0398ba559408e4effa2372697a0cc4d189756.zip u-boot-32f0398ba559408e4effa2372697a0cc4d189756.tar.gz u-boot-32f0398ba559408e4effa2372697a0cc4d189756.tar.bz2 | |
ata: Migrate CONFIG_SATA_SIL3114 to Kconfig
Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
| -rw-r--r-- | configs/MPC8349ITX_LOWBOOT_defconfig | 1 | ||||
| -rw-r--r-- | configs/MPC8349ITX_defconfig | 1 | ||||
| -rw-r--r-- | configs/TWR-P1025_defconfig | 1 | ||||
| -rw-r--r-- | drivers/ata/Kconfig | 5 | ||||
| -rw-r--r-- | include/configs/MPC8349ITX.h | 1 | ||||
| -rw-r--r-- | include/configs/p1_twr.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
7 files changed, 8 insertions, 3 deletions
diff --git a/configs/MPC8349ITX_LOWBOOT_defconfig b/configs/MPC8349ITX_LOWBOOT_defconfig index 0893c4a..c95cec6 100644 --- 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 8a8f055..4403bc0 100644 --- 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 5dda2bb..1eedd3c 100644 --- 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 617c80f..77e0fbb 100644 --- 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 d06d4a2..23fe158 100644 --- 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 e969204..5edf071 100644 --- 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 53f0857..dc69c19 100644 --- 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 |