Migrate ATA drivers to Kconfig

PATCH New Tuomas Tynkkynen 2 participants 21 messages Dec 8, 2017 – Dec 13, 2017

Subsystems (3)

Arm i.MX and Layerscape Arm/Zynq architecture Arm/Allwinner sunXi SoC support

lore

Share & tools

lore

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #0 lore raw

cover Migrate ATA drivers to Kconfig

This series migrates ATA drivers (that is, CONFIG_x symbols listed in drivers/ata/Makefile) to Kconfig. In the process we get to remove two unused drivers.

Potential improvements on the help texts and/or Kconfig dependencies on the added symbols are welcome.

Tuomas Tynkkynen (10):
ata: Drop CONFIG_SATA_DWC
ata: Drop CONFIG_MX51_PATA
ata: Migrate CONFIG_SATA_SIL to Kconfig
ata: Migrate CONFIG_SATA_SIL3114 to Kconfig
ata: Migrate CONFIG_SATA_MV to Kconfig
ata: Migrate CONFIG_FSL_SATA to Kconfig
ata: Migrate CONFIG_DWC_AHSATA to Kconfig
ata: Migrate CONFIG_SCSI_AHCI to Kconfig
ata: Migrate CONFIG_LIBATA to Kconfig
ata: Migrate CONFIG_MVSATA_IDE to Kconfig

 arch/arm/Kconfig                                   |    3 +
 arch/arm/cpu/armv7/ls102xa/Kconfig                 |    1 +
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig          |    2 +
 arch/arm/include/asm/arch-ls102xa/config.h         |    2 -
 arch/arm/mach-kirkwood/include/mach/config.h       |    1 -
 arch/powerpc/cpu/mpc83xx/Kconfig                   |    1 +
 arch/powerpc/cpu/mpc85xx/Kconfig                   |   19 +
 arch/x86/cpu/baytrail/Kconfig                      |    1 +
 arch/x86/cpu/braswell/Kconfig                      |    1 +
 arch/x86/cpu/broadwell/Kconfig                     |    1 +
 arch/x86/cpu/coreboot/Kconfig                      |    1 +
 arch/x86/cpu/ivybridge/Kconfig                     |    1 +
 arch/x86/cpu/qemu/Kconfig                          |    1 +
 arch/x86/cpu/queensbay/Kconfig                     |    1 +
 configs/A10-OLinuXino-Lime_defconfig               |    1 +
 configs/A20-OLinuXino-Lime2-eMMC_defconfig         |    1 +
 configs/A20-OLinuXino-Lime2_defconfig              |    1 +
 configs/A20-OLinuXino-Lime_defconfig               |    1 +
 configs/A20-OLinuXino_MICRO-eMMC_defconfig         |    1 +
 configs/A20-OLinuXino_MICRO_defconfig              |    1 +
 configs/A20-Olimex-SOM-EVB_defconfig               |    1 +
 configs/Bananapi_M2_Ultra_defconfig                |    1 +
 configs/Bananapi_defconfig                         |    1 +
 configs/Bananapro_defconfig                        |    1 +
 configs/Cubieboard2_defconfig                      |    1 +
 configs/Cubieboard_defconfig                       |    1 +
 configs/Cubietruck_defconfig                       |    1 +
 configs/Itead_Ibox_A20_defconfig                   |    1 +
 configs/Lamobo_R1_defconfig                        |    1 +
 configs/Linksprite_pcDuino3_Nano_defconfig         |    1 +
 configs/Linksprite_pcDuino3_defconfig              |    1 +
 configs/MPC8315ERDB_defconfig                      |    1 +
 configs/MPC8349ITX_LOWBOOT_defconfig               |    1 +
 configs/MPC8349ITX_defconfig                       |    1 +
 configs/MPC837XERDB_defconfig                      |    1 +
 configs/MPC8544DS_defconfig                        |    1 +
 configs/MPC8572DS_36BIT_defconfig                  |    1 +
 configs/MPC8572DS_defconfig                        |    1 +
 configs/MPC8610HPCD_defconfig                      |    1 +
 configs/MPC8641HPCN_36BIT_defconfig                |    1 +
 configs/MPC8641HPCN_defconfig                      |    1 +
 configs/Marsboard_A10_defconfig                    |    1 +
 configs/Mele_A1000_defconfig                       |    1 +
 configs/Mele_M5_defconfig                          |    1 +
 configs/Orangepi_defconfig                         |    1 +
 configs/Orangepi_mini_defconfig                    |    1 +
 configs/TWR-P1025_defconfig                        |    1 +
 configs/Wits_Pro_A20_DKT_defconfig                 |    1 +
 configs/am57xx_evm_defconfig                       |    1 +
 configs/am57xx_hs_evm_defconfig                    |    1 +
 configs/apalis_imx6_defconfig                      |    1 +
 configs/apalis_imx6_nospl_com_defconfig            |    1 +
 configs/apalis_imx6_nospl_it_defconfig             |    1 +
 configs/bananapi_m1_plus_defconfig                 |    1 +
 configs/cgtqmx6eval_defconfig                      |    1 +
 configs/cl-som-am57x_defconfig                     |    1 +
 configs/cm_fx6_defconfig                           |    1 +
 configs/cm_t54_defconfig                           |    1 +
 .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig  |    1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig      |    1 +
 configs/controlcenterdc_defconfig                  |    1 +
 configs/d2net_v2_defconfig                         |    1 +
 configs/db-88f6820-gp_defconfig                    |    1 +
 configs/db-mv784mp-gp_defconfig                    |    1 +
 configs/dh_imx6_defconfig                          |    1 +
 configs/dms-ba16-1g_defconfig                      |    1 +
 configs/dms-ba16_defconfig                         |    1 +
 configs/dns325_defconfig                           |    1 +
 configs/dreamplug_defconfig                        |    1 +
 configs/ds109_defconfig                            |    1 +
 configs/edminiv2_defconfig                         |    1 +
 configs/goflexhome_defconfig                       |    1 +
 configs/guruplug_defconfig                         |    1 +
 configs/gwventana_emmc_defconfig                   |    1 +
 configs/gwventana_gw5904_defconfig                 |    1 +
 configs/gwventana_nand_defconfig                   |    1 +
 configs/highbank_defconfig                         |    1 +
 configs/ib62x0_defconfig                           |    1 +
 configs/inetspace_v2_defconfig                     |    1 +
 configs/ls1012aqds_qspi_defconfig                  |    1 +
 configs/ls1088aqds_qspi_defconfig                  |    1 +
 configs/ls1088aqds_sdcard_qspi_defconfig           |    1 +
 configs/ls1088ardb_qspi_defconfig                  |    1 +
 configs/ls1088ardb_sdcard_qspi_defconfig           |    1 +
 configs/ls2081ardb_defconfig                       |    1 +
 configs/lschlv2_defconfig                          |    1 +
 configs/lsxhl_defconfig                            |    1 +
 configs/m53evk_defconfig                           |    1 +
 configs/mvebu_db-88f3720_defconfig                 |    1 +
 configs/mvebu_db_armada8k_defconfig                |    1 +
 configs/mvebu_espressobin-88f3720_defconfig        |    1 +
 configs/mvebu_mcbin-88f8040_defconfig              |    1 +
 configs/mx53loco_defconfig                         |    1 +
 configs/mx6cuboxi_defconfig                        |    1 +
 configs/mx6qsabrelite_defconfig                    |    1 +
 configs/nas220_defconfig                           |    1 +
 configs/net2big_v2_defconfig                       |    1 +
 configs/netspace_lite_v2_defconfig                 |    1 +
 configs/netspace_max_v2_defconfig                  |    1 +
 configs/netspace_mini_v2_defconfig                 |    1 +
 configs/netspace_v2_defconfig                      |    1 +
 configs/nitrogen6q2g_defconfig                     |    1 +
 configs/nitrogen6q_defconfig                       |    1 +
 configs/novena_defconfig                           |    1 +
 configs/nsa310s_defconfig                          |    1 +
 configs/omap5_uevm_defconfig                       |    1 +
 configs/openrd_base_defconfig                      |    1 +
 configs/openrd_client_defconfig                    |    1 +
 configs/openrd_ultimate_defconfig                  |    1 +
 configs/ot1200_defconfig                           |    1 +
 configs/ot1200_spl_defconfig                       |    1 +
 configs/qemu_arm_defconfig                         |    1 +
 configs/sheevaplug_defconfig                       |    1 +
 configs/tbs2910_defconfig                          |    1 +
 configs/theadorable_debug_defconfig                |    1 +
 configs/turris_omnia_defconfig                     |    1 +
 configs/udoo_defconfig                             |    1 +
 configs/wandboard_defconfig                        |    1 +
 configs/xilinx_zynqmp_ep_defconfig                 |    1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig      |    1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig        |    1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig        |    1 +
 drivers/ata/Kconfig                                |   51 +
 drivers/ata/Makefile                               |    2 -
 drivers/ata/mxc_ata.c                              |  129 --
 drivers/ata/sata_dwc.c                             | 2077 --------------------
 drivers/ata/sata_dwc.h                             |  458 -----
 include/configs/MPC8315ERDB.h                      |    3 -
 include/configs/MPC8349ITX.h                       |    2 -
 include/configs/MPC837XEMDS.h                      |    3 -
 include/configs/MPC837XERDB.h                      |    3 -
 include/configs/MPC8536DS.h                        |    3 -
 include/configs/MPC8544DS.h                        |    2 -
 include/configs/MPC8572DS.h                        |    2 -
 include/configs/MPC8610HPCD.h                      |    3 -
 include/configs/MPC8641HPCN.h                      |    3 -
 include/configs/P1010RDB.h                         |    2 -
 include/configs/P1022DS.h                          |    2 -
 include/configs/P2041RDB.h                         |    3 -
 include/configs/P4080DS.h                          |    2 -
 include/configs/T102xQDS.h                         |    2 -
 include/configs/T1040QDS.h                         |    3 -
 include/configs/T104xRDB.h                         |    3 -
 include/configs/T208xQDS.h                         |    2 -
 include/configs/T208xRDB.h                         |    2 -
 include/configs/T4240QDS.h                         |    3 -
 include/configs/T4240RDB.h                         |    6 -
 include/configs/UCP1020.h                          |    2 -
 include/configs/advantech_dms-ba16.h               |    2 -
 include/configs/am57xx_evm.h                       |    2 -
 include/configs/apalis_imx6.h                      |    2 -
 include/configs/cgtqmx6eval.h                      |    2 -
 include/configs/cl-som-am57x.h                     |    2 -
 include/configs/cm_fx6.h                           |    2 -
 include/configs/cm_t54.h                           |    2 -
 include/configs/controlcenterd.h                   |    2 -
 include/configs/controlcenterdc.h                  |    2 -
 include/configs/corenet_ds.h                       |    3 -
 include/configs/cyrus.h                            |    3 -
 include/configs/db-88f6820-gp.h                    |    2 -
 include/configs/db-mv784mp-gp.h                    |    2 -
 include/configs/dh_imx6.h                          |    2 -
 include/configs/dra7xx_evm.h                       |    2 -
 include/configs/edminiv2.h                         |    1 -
 include/configs/efi-x86.h                          |    2 -
 include/configs/galileo.h                          |    3 -
 include/configs/ge_bx50v3.h                        |    2 -
 include/configs/gw_ventana.h                       |    2 -
 include/configs/highbank.h                         |    2 -
 include/configs/ls1012aqds.h                       |    2 -
 include/configs/ls1012ardb.h                       |    2 -
 include/configs/ls1021aiot.h                       |    2 -
 include/configs/ls1043aqds.h                       |    2 -
 include/configs/ls1043ardb.h                       |    2 -
 include/configs/ls1046aqds.h                       |    2 -
 include/configs/ls1046ardb.h                       |    2 -
 include/configs/ls1088a_common.h                   |    2 -
 include/configs/ls2080aqds.h                       |    2 -
 include/configs/ls2080ardb.h                       |    2 -
 include/configs/m53evk.h                           |    2 -
 include/configs/mvebu_armada-37xx.h                |    2 -
 include/configs/mvebu_armada-8k.h                  |    2 -
 include/configs/mx53loco.h                         |    2 -
 include/configs/mx6cuboxi.h                        |    2 -
 include/configs/nitrogen6x.h                       |    2 -
 include/configs/novena.h                           |    2 -
 include/configs/omap5_uevm.h                       |    2 -
 include/configs/ot1200.h                           |    2 -
 include/configs/p1_p2_rdb_pc.h                     |    2 -
 include/configs/p1_twr.h                           |    2 -
 include/configs/qemu-arm.h                         |    2 -
 include/configs/sbc8641d.h                         |    2 -
 include/configs/sunxi-common.h                     |    2 -
 include/configs/t4qds.h                            |    3 -
 include/configs/tbs2910.h                          |    2 -
 include/configs/theadorable.h                      |    2 -
 include/configs/turris_omnia.h                     |    2 -
 include/configs/udoo.h                             |    2 -
 include/configs/wandboard.h                        |    2 -
 include/configs/x86-common.h                       |    3 -
 include/configs/xilinx_zynqmp.h                    |    2 -
 scripts/config_whitelist.txt                       |    8 -
 202 files changed, 192 insertions(+), 2843 deletions(-)
 delete mode 100644 drivers/ata/mxc_ata.c
 delete mode 100644 drivers/ata/sata_dwc.c
 delete mode 100644 drivers/ata/sata_dwc.h

Signature · 1 line

2.15.0

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #1 lore raw

PATCH 1/10 ata: Drop CONFIG_SATA_DWC

The last user of this driver went away in June 2017, in commit:
98f705c9ce ("powerpc: remove 4xx support")

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

---
 drivers/ata/Makefile   |    1 -
 drivers/ata/sata_dwc.c | 2077 ------------------------------------------------
 drivers/ata/sata_dwc.h |  458 -----------
 3 files changed, 2536 deletions(-)
 delete mode 100644 drivers/ata/sata_dwc.c
 delete mode 100644 drivers/ata/sata_dwc.h

ata/Makefile +0 -1

index 4e2de93025..7a4c8c6bf2 100644
@@ -16,7 +16,6 @@ obj-$(CONFIG_MVSATA_IDE) += mvsata_ide.o
 obj-$(CONFIG_MX51_PATA) += mxc_ata.o
 obj-$(CONFIG_SATA) += sata.o
 obj-$(CONFIG_SATA_CEVA) += sata_ceva.o
-obj-$(CONFIG_SATA_DWC) += sata_dwc.o
 obj-$(CONFIG_SATA_MV) += sata_mv.o
 obj-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
 obj-$(CONFIG_SATA_SIL) += sata_sil.o

ata/sata_dwc.c deleted +0 ~~-2077~~

2,077 lines not on this page · raw message

ata/sata_dwc.h deleted +0 ~~-458~~

458 lines not on this page · raw message

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:25 UTC #2 lore raw

PATCH 1/10 ata: Drop CONFIG_SATA_DWC

Quoted 4 lines · Tuomas Tynkkynen

The last user of this driver went away in June 2017, in commit:
98f705c9ce ("powerpc: remove 4xx support")
Signed-off-by Tuomas Tynkkynen <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/120385c6/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #3 lore raw

PATCH 2/10 ata: Drop CONFIG_MX51_PATA

In reply to Tuomas Tynkkynen

The last user of this driver went away in August 2015 in commit:
b6073fd2115 ("arm: Remove mx51_efikamx, mx51_efikasb boards")

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

---
 drivers/ata/Makefile  |   1 -
 drivers/ata/mxc_ata.c | 129 --------------------------------------------------
 2 files changed, 130 deletions(-)
 delete mode 100644 drivers/ata/mxc_ata.c

ata/Makefile +0 -1

index 7a4c8c6bf2..a94c804e7a 100644
@@ -13,7 +13,6 @@ obj-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o
 obj-$(CONFIG_FSL_SATA) += fsl_sata.o
 obj-$(CONFIG_LIBATA) += libata.o
 obj-$(CONFIG_MVSATA_IDE) += mvsata_ide.o
-obj-$(CONFIG_MX51_PATA) += mxc_ata.o
 obj-$(CONFIG_SATA) += sata.o
 obj-$(CONFIG_SATA_CEVA) += sata_ceva.o
 obj-$(CONFIG_SATA_MV) += sata_mv.o

ata/mxc_ata.c deleted +0 ~~-129~~

129 lines not on this page · raw message

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:25 UTC #4 lore raw

PATCH 2/10 ata: Drop CONFIG_MX51_PATA

Quoted 4 lines · Tuomas Tynkkynen

The last user of this driver went away in August 2015 in commit:
b6073fd2115 ("arm: Remove mx51_efikamx, mx51_efikasb boards")
Signed-off-by Tuomas Tynkkynen <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/1292f230/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #5 lore raw

PATCH 3/10 ata: Migrate CONFIG_SATA_SIL to Kconfig

In reply to Tuomas Tynkkynen

Use 'imply' here liberally to avoid the combinatorial explosion of defconfig changes in the PowerPC boards.

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

---
 arch/powerpc/cpu/mpc85xx/Kconfig | 6 ++++++
 drivers/ata/Kconfig              | 6 ++++++
 include/configs/P4080DS.h        | 1 -
 include/configs/UCP1020.h        | 1 -
 include/configs/p1_p2_rdb_pc.h   | 1 -
 scripts/config_whitelist.txt     | 1 -
 6 files changed, 12 insertions(+), 4 deletions(-)

powerpc/cpu/mpc85xx/Kconfig +6 -0

index 92187d371b..1b0e3d3a2f 100644
@@ -209,6 +209,7 @@ config TARGET_P1025RDB
 	select ARCH_P1025
 	imply CMD_EEPROM
 	imply CMD_SATA
+	imply SATA_SIL
 
 config TARGET_P2020RDB
 	bool "Support P2020RDB-PC"

@@ -217,6 +218,7 @@ config TARGET_P2020RDB
 	select ARCH_P2020
 	imply CMD_EEPROM
 	imply CMD_SATA
+	imply SATA_SIL
 
 config TARGET_P1_TWR
 	bool "Support p1_twr"

@@ -672,6 +674,7 @@ config ARCH_P1020
 	imply CMD_SATA
 	imply CMD_PCI
 	imply CMD_REGINFO
+	imply SATA_SIL
 
 config ARCH_P1021
 	bool

@@ -690,6 +693,7 @@ config ARCH_P1021
 	imply CMD_NAND
 	imply CMD_SATA
 	imply CMD_REGINFO
+	imply SATA_SIL
 
 config ARCH_P1022
 	bool

@@ -737,6 +741,7 @@ config ARCH_P1024
 	imply CMD_SATA
 	imply CMD_PCI
 	imply CMD_REGINFO
+	imply SATA_SIL
 
 config ARCH_P1025
 	bool

@@ -858,6 +863,7 @@ config ARCH_P4080
 	select FSL_ELBC
 	imply CMD_SATA
 	imply CMD_REGINFO
+	imply SATA_SIL
 
 config ARCH_P5020
 	bool

ata/Kconfig +6 -0

index 803064aaf1..617c80f011 100644
@@ -47,4 +47,10 @@ config DWC_AHCI
 	  Enable this driver to support Sata devices through
 	  Synopsys DWC AHCI module.
 
+config SATA_SIL
+	bool "Enable Silicon Image SIL3131 / SIL3132 / SIL3124 SATA driver support"
+	help
+	  Enable this driver to support the SIL3131, SIL3132 and SIL3124
+	  SATA controllers.
+
 endmenu

configs/P4080DS.h +0 -1

index f192181c08..8b884411ac 100644
@@ -12,7 +12,6 @@
 
 #define CONFIG_PCIE3
 
-#define CONFIG_SATA_SIL
 #define CONFIG_SYS_SATA_MAX_DEVICE  2
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

configs/UCP1020.h +0 -1

index 902abc48ce..455298751c 100644
@@ -118,7 +118,6 @@
 
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_SATA_SIL
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

configs/p1_p2_rdb_pc.h +0 -1

index 1b665b2c15..3f073d06cb 100644
@@ -244,7 +244,6 @@
 #define CONFIG_TSEC_ENET	/* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_SATA_SIL
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

config_whitelist.txt +0 -1

index c2fe81e552..416b6e2aa5 100644
@@ -1905,7 +1905,6 @@ CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
 CONFIG_SATA_MV
-CONFIG_SATA_SIL
 CONFIG_SATA_SIL3114
 CONFIG_SATA_ULI5288
 CONFIG_SBC8349

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:26 UTC #6 lore raw

PATCH 3/10 ata: Migrate CONFIG_SATA_SIL to Kconfig

Quoted 4 lines · Tuomas Tynkkynen

Use 'imply' here liberally to avoid the combinatorial explosion of defconfig changes in the PowerPC boards.
Signed-off-by Tuomas Tynkkynen <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/367d0cd5/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #7 lore raw

PATCH 4/10 ata: Migrate CONFIG_SATA_SIL3114 to Kconfig

In reply to Tuomas Tynkkynen

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

---
 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(-)

MPC8349ITX_LOWBOOT_defconfig +1 -0

index 0893c4ac02..c95cec698a 100644
@@ -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

MPC8349ITX_defconfig +1 -0

index 8a8f05544f..4403bc0d62 100644
@@ -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

TWR-P1025_defconfig +1 -0

index 5dda2bbdb5..1eedd3c21f 100644
@@ -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

ata/Kconfig +5 -0

index 617c80f011..77e0fbb217 100644
@@ -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

configs/MPC8349ITX.h +0 -1

index d06d4a2817..23fe158f74 100644
@@ -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

configs/p1_twr.h +0 -1

index e9692048d1..5edf07197f 100644
@@ -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

config_whitelist.txt +0 -1

index 416b6e2aa5..625f610a16 100644
@@ -1905,7 +1905,6 @@ CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
 CONFIG_SATA_MV
-CONFIG_SATA_SIL3114
 CONFIG_SATA_ULI5288
 CONFIG_SBC8349
 CONFIG_SBC8548

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:26 UTC #8 lore raw

PATCH 4/10 ata: Migrate CONFIG_SATA_SIL3114 to Kconfig

Quoted 1 line · Tuomas Tynkkynen

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

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/a0b6ddaa/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #9 lore raw

PATCH 5/10 ata: Migrate CONFIG_SATA_MV to Kconfig

In reply to Tuomas Tynkkynen

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

---
 configs/db-mv784mp-gp_defconfig     | 1 +
 configs/theadorable_debug_defconfig | 1 +
 drivers/ata/Kconfig                 | 6 ++++++
 include/configs/db-mv784mp-gp.h     | 1 -
 include/configs/theadorable.h       | 1 -
 scripts/config_whitelist.txt        | 1 -
 6 files changed, 8 insertions(+), 3 deletions(-)

db-mv784mp-gp_defconfig +1 -0

index 23eaa123a2..6724af04bc 100644
@@ -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

theadorable_debug_defconfig +1 -0

index 863d6ce3d0..f602c839c3 100644
@@ -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

ata/Kconfig +6 -0

index 77e0fbb217..8dfa4670cc 100644
@@ -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

configs/db-mv784mp-gp.h +0 -1

index 4a5be6188f..105578ffc6 100644
@@ -49,7 +49,6 @@
 
 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_SATA_MV
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

configs/theadorable.h +0 -1

index a7001e76aa..774324f28b 100644
@@ -65,7 +65,6 @@
 
 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
-#define CONFIG_SATA_MV
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

config_whitelist.txt +0 -1

index 625f610a16..955369abde 100644
@@ -1904,7 +1904,6 @@ CONFIG_SAR2_REG
 CONFIG_SAR_REG
 CONFIG_SATA1
 CONFIG_SATA2
-CONFIG_SATA_MV
 CONFIG_SATA_ULI5288
 CONFIG_SBC8349
 CONFIG_SBC8548

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:26 UTC #10 lore raw

PATCH 5/10 ata: Migrate CONFIG_SATA_MV to Kconfig

Quoted 1 line · Tuomas Tynkkynen

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

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/b0425339/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #11 lore raw

PATCH 6/10 ata: Migrate CONFIG_FSL_SATA to Kconfig

In reply to Tuomas Tynkkynen

Use 'imply' here liberally to avoid the combinatorial explosion of defconfig changes in the PowerPC boards.

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

---
 arch/powerpc/cpu/mpc83xx/Kconfig                      |  1 +
 arch/powerpc/cpu/mpc85xx/Kconfig                      | 13 +++++++++++++
 configs/MPC8315ERDB_defconfig                         |  1 +
 configs/MPC837XERDB_defconfig                         |  1 +
 configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig |  1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig         |  1 +
 drivers/ata/Kconfig                                   |  6 ++++++
 include/configs/MPC8315ERDB.h                         |  1 -
 include/configs/MPC837XEMDS.h                         |  1 -
 include/configs/MPC837XERDB.h                         |  1 -
 include/configs/MPC8536DS.h                           |  1 -
 include/configs/P1010RDB.h                            |  1 -
 include/configs/P1022DS.h                             |  1 -
 include/configs/P2041RDB.h                            |  1 -
 include/configs/T102xQDS.h                            |  1 -
 include/configs/T1040QDS.h                            |  1 -
 include/configs/T104xRDB.h                            |  1 -
 include/configs/T208xQDS.h                            |  1 -
 include/configs/T208xRDB.h                            |  1 -
 include/configs/T4240QDS.h                            |  1 -
 include/configs/T4240RDB.h                            |  2 --
 include/configs/controlcenterd.h                      |  1 -
 include/configs/corenet_ds.h                          |  1 -
 include/configs/cyrus.h                               |  1 -
 include/configs/t4qds.h                               |  1 -
 scripts/config_whitelist.txt                          |  1 -
 26 files changed, 24 insertions(+), 20 deletions(-)

powerpc/cpu/mpc83xx/Kconfig +1 -0

index a3779734c1..05d29d2fd9 100644
@@ -55,6 +55,7 @@ config TARGET_MPC837XEMDS
 	bool "Support MPC837XEMDS"
 	select BOARD_EARLY_INIT_F
 	imply CMD_SATA
+	imply FSL_SATA
 
 config TARGET_MPC837XERDB
 	bool "Support MPC837XERDB"

powerpc/cpu/mpc85xx/Kconfig +13 -0

index 1b0e3d3a2f..5df8175f1e 100644
@@ -92,6 +92,7 @@ config TARGET_MPC8536DS
 # Use DDR3 controller with DDR2 DIMMs on this board
 	select SYS_FSL_DDRC_GEN3
 	imply CMD_SATA
+	imply FSL_SATA
 
 config TARGET_MPC8541CDS
 	bool "Support MPC8541CDS"

@@ -148,6 +149,7 @@ config TARGET_P1022DS
 	select SUPPORT_SPL
 	select SUPPORT_TPL
 	imply CMD_SATA
+	imply FSL_SATA
 
 config TARGET_P1023RDB
 	bool "Support P1023RDB"

@@ -230,6 +232,7 @@ config TARGET_P2041RDB
 	select BOARD_LATE_INIT if CHAIN_OF_TRUST
 	select PHYS_64BIT
 	imply CMD_SATA
+	imply FSL_SATA
 
 config TARGET_QEMU_PPCE500
 	bool "Support qemu-ppce500"

@@ -244,6 +247,7 @@ config TARGET_T1024QDS
 	select PHYS_64BIT
 	imply CMD_EEPROM
 	imply CMD_SATA
+	imply FSL_SATA
 
 config TARGET_T1023RDB
 	bool "Support T1023RDB"

@@ -642,6 +646,7 @@ config ARCH_P1010
 	imply CMD_SATA
 	imply CMD_PCI
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config ARCH_P1011
 	bool

@@ -826,6 +831,7 @@ config ARCH_P3041
 	imply CMD_NAND
 	imply CMD_SATA
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config ARCH_P4080
 	bool

@@ -887,6 +893,7 @@ config ARCH_P5020
 	select FSL_ELBC
 	imply CMD_SATA
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config ARCH_P5040
 	bool

@@ -910,6 +917,7 @@ config ARCH_P5040
 	select FSL_ELBC
 	imply CMD_SATA
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config ARCH_QEMU_E500
 	bool

@@ -976,6 +984,7 @@ config ARCH_T1040
 	imply CMD_NAND
 	imply CMD_SATA
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config ARCH_T1042
 	bool

@@ -998,6 +1007,7 @@ config ARCH_T1042
 	imply CMD_NAND
 	imply CMD_SATA
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config ARCH_T2080
 	bool

@@ -1023,6 +1033,7 @@ config ARCH_T2080
 	imply CMD_SATA
 	imply CMD_NAND
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config ARCH_T2081
 	bool

@@ -1069,6 +1080,7 @@ config ARCH_T4160
 	imply CMD_SATA
 	imply CMD_NAND
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config ARCH_T4240
 	bool

@@ -1096,6 +1108,7 @@ config ARCH_T4240
 	imply CMD_SATA
 	imply CMD_NAND
 	imply CMD_REGINFO
+	imply FSL_SATA
 
 config BOOKE
 	bool

MPC8315ERDB_defconfig +1 -0

index fc846b26bd..473b9a6d5a 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=e0600000.flash"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=e0600000.flash:512k(uboot),128k(env),6m at 1m(kernel),-(fs)"
+CONFIG_FSL_SATA=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y

MPC837XERDB_defconfig +1 -0

index 14b7a5a8ba..bc54b3ac52 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_FSL_SATA=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y

controlcenterd_36BIT_SDCARD_DEVELOP_defconfig +1 -0

index 48e9f6e920..67fa8e4e87 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_FSL_SATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y

controlcenterd_36BIT_SDCARD_defconfig +1 -0

index 58729b62ad..19a4daa2c2 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_FSL_SATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y

ata/Kconfig +6 -0

index 8dfa4670cc..2eab570b35 100644
@@ -47,6 +47,12 @@ config DWC_AHCI
 	  Enable this driver to support Sata devices through
 	  Synopsys DWC AHCI module.
 
+config FSL_SATA
+	bool "Enable Freescale SATA controller driver support"
+	help
+	  Enable this driver to support the SATA controller found in
+	  some Freescale PowerPC SoCs.
+
 config SATA_MV
 	bool "Enable Marvell SATA controller driver support"
 	help

configs/MPC8315ERDB.h +0 -1

index b6715418fc..a23c4ef522 100644
@@ -396,7 +396,6 @@
  * SATA
  */
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/MPC837XEMDS.h +0 -1

index 264aa90cb3..f0b856c2c8 100644
@@ -421,7 +421,6 @@ extern int board_pci_host_broken(void);
  * SATA
  */
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/MPC837XERDB.h +0 -1

index beec38f934..d865c22644 100644
@@ -435,7 +435,6 @@
  * SATA
  */
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/MPC8536DS.h +0 -1

index 3319a6f958..d060e8c235 100644
@@ -509,7 +509,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/P1010RDB.h +0 -1

index cbc15ae4c5..87c8962a9d 100644
@@ -634,7 +634,6 @@ extern unsigned long get_sdram_size(void);
 #endif	/* CONFIG_TSEC_ENET */
 
 /* SATA */
-#define CONFIG_FSL_SATA
 #define CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA

configs/P1022DS.h +0 -1

index 4756a7102d..7d4ac61194 100644
@@ -483,7 +483,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 #define CONFIG_FSL_SATA_V2
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2

configs/P2041RDB.h +0 -1

index 600823798c..9046567baa 100644
@@ -527,7 +527,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_FSL_SATA_V2
 
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_FSL_SATA
 #define CONFIG_LIBATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2

configs/T102xQDS.h +0 -1

index 259e8a01f3..974717fde6 100644
@@ -616,7 +616,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T1040QDS.h +0 -1

index c694e50c2c..ac3d19301a 100644
@@ -501,7 +501,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/T104xRDB.h +0 -1

index 2dbeffdd2a..ebcae95722 100644
@@ -615,7 +615,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_SATA1

configs/T208xQDS.h +0 -1

index 41926f76e6..b19a677eb9 100644
@@ -679,7 +679,6 @@ unsigned long get_board_ddr_clk(void);
  */
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T208xRDB.h +0 -1

index d2ddb17fce..66ce31bc0c 100644
@@ -629,7 +629,6 @@ unsigned long get_board_ddr_clk(void);
  */
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T4240QDS.h +0 -1

index 885dc776eb..e2caa02f67 100644
@@ -469,7 +469,6 @@ unsigned long get_board_ddr_clk(void);
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/T4240RDB.h +0 -2

index 625130aafc..70705a7b49 100644
@@ -241,7 +241,6 @@
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

@@ -636,7 +635,6 @@ unsigned long get_board_ddr_clk(void);
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/controlcenterd.h +0 -1

index 37c8be48ac..bb038f14c2 100644
@@ -248,7 +248,6 @@
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
 
-#define CONFIG_FSL_SATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/corenet_ds.h +0 -1

index 0dbf149725..b49b826eb4 100644
@@ -542,7 +542,6 @@
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/cyrus.h +0 -1

index 1b20d85acf..b6597034e2 100644
@@ -377,7 +377,6 @@
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

configs/t4qds.h +0 -1

index 4938f43985..07060e6813 100644
@@ -210,7 +210,6 @@
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
 #define CONFIG_LIBATA
-#define CONFIG_FSL_SATA
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1

config_whitelist.txt +0 -1

index 955369abde..db2e6d28f9 100644
@@ -754,7 +754,6 @@ CONFIG_FSL_PMIC_MODE
 CONFIG_FSL_QIXIS
 CONFIG_FSL_QIXIS_CLOCK_MEASUREMENT
 CONFIG_FSL_QIXIS_V2
-CONFIG_FSL_SATA
 CONFIG_FSL_SATA_V2
 CONFIG_FSL_SDHC_V2_3
 CONFIG_FSL_SDRAM_TYPE

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:26 UTC #12 lore raw

PATCH 6/10 ata: Migrate CONFIG_FSL_SATA to Kconfig

Quoted 4 lines · Tuomas Tynkkynen

Use 'imply' here liberally to avoid the combinatorial explosion of defconfig changes in the PowerPC boards.
Signed-off-by Tuomas Tynkkynen <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/433a3bd2/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #13 lore raw

PATCH 7/10 ata: Migrate CONFIG_DWC_AHSATA to Kconfig

In reply to Tuomas Tynkkynen

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

---
 configs/apalis_imx6_defconfig           | 1 +
 configs/apalis_imx6_nospl_com_defconfig | 1 +
 configs/apalis_imx6_nospl_it_defconfig  | 1 +
 configs/cgtqmx6eval_defconfig           | 1 +
 configs/cm_fx6_defconfig                | 1 +
 configs/dh_imx6_defconfig               | 1 +
 configs/dms-ba16-1g_defconfig           | 1 +
 configs/dms-ba16_defconfig              | 1 +
 configs/gwventana_emmc_defconfig        | 1 +
 configs/gwventana_gw5904_defconfig      | 1 +
 configs/gwventana_nand_defconfig        | 1 +
 configs/m53evk_defconfig                | 1 +
 configs/mx53loco_defconfig              | 1 +
 configs/mx6cuboxi_defconfig             | 1 +
 configs/mx6qsabrelite_defconfig         | 1 +
 configs/nitrogen6q2g_defconfig          | 1 +
 configs/nitrogen6q_defconfig            | 1 +
 configs/novena_defconfig                | 1 +
 configs/ot1200_defconfig                | 1 +
 configs/ot1200_spl_defconfig            | 1 +
 configs/tbs2910_defconfig               | 1 +
 configs/udoo_defconfig                  | 1 +
 configs/wandboard_defconfig             | 1 +
 drivers/ata/Kconfig                     | 6 ++++++
 include/configs/advantech_dms-ba16.h    | 1 -
 include/configs/apalis_imx6.h           | 1 -
 include/configs/cgtqmx6eval.h           | 1 -
 include/configs/cm_fx6.h                | 1 -
 include/configs/dh_imx6.h               | 1 -
 include/configs/ge_bx50v3.h             | 1 -
 include/configs/gw_ventana.h            | 1 -
 include/configs/m53evk.h                | 1 -
 include/configs/mx53loco.h              | 1 -
 include/configs/mx6cuboxi.h             | 1 -
 include/configs/nitrogen6x.h            | 1 -
 include/configs/novena.h                | 1 -
 include/configs/ot1200.h                | 1 -
 include/configs/tbs2910.h               | 1 -
 include/configs/udoo.h                  | 1 -
 include/configs/wandboard.h             | 1 -
 scripts/config_whitelist.txt            | 1 -
 41 files changed, 29 insertions(+), 17 deletions(-)

apalis_imx6_defconfig +1 -0

index 2b1b34d80a..18107e88ff 100644
@@ -45,6 +45,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

apalis_imx6_nospl_com_defconfig +1 -0

index ddf8c8d1e3..c40e14fdf2 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

apalis_imx6_nospl_it_defconfig +1 -0

index 6eba47b8ce..5d1243ad92 100644
@@ -34,6 +34,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

cgtqmx6eval_defconfig +1 -0

index 47c0b4c622..418e4e2d8c 100644
@@ -45,6 +45,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DWC_AHSATA=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
 CONFIG_PHYLIB=y

cm_fx6_defconfig +1 -0

index 0773aca0d4..8e0746bcf8 100644
@@ -52,6 +52,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)"
 CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DWC_AHSATA=y
 CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y

dh_imx6_defconfig +1 -0

index 814df1cd27..1fd7c50e31 100644
@@ -40,6 +40,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_PHYLIB=y

dms-ba16-1g_defconfig +1 -0

index cbc9e82eed..144a86bcbf 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y

dms-ba16_defconfig +1 -0

index 9be2d6cc52..075e5070f0 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y

gwventana_emmc_defconfig +1 -0

index 5379cf3b3b..b35d0914e3 100644
@@ -53,6 +53,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y

gwventana_gw5904_defconfig +1 -0

index fe364d07ce..6a2c196c9b 100644
@@ -53,6 +53,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_MV88E61XX_SWITCH=y
 CONFIG_MV88E61XX_CPU_PORT=5

gwventana_nand_defconfig +1 -0

index dd4d73ce9e..be6cf0cbde 100644
@@ -56,6 +56,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y

m53evk_defconfig +1 -0

index 291144d421..845aee4730 100644
@@ -39,6 +39,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1024k(u-boot),512k(env1),512k(env2),14m(boot),240m(data),- at 2048k(UBI)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_DWC_AHSATA=y
 CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y

mx53loco_defconfig +1 -0

index 3fba84c047..7471b10aa0 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_DWC_AHSATA=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

mx6cuboxi_defconfig +1 -0

index 0a76801219..a69a66f2e4 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y

mx6qsabrelite_defconfig +1 -0

index 6beb52893c..c52c3923b4 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y

nitrogen6q2g_defconfig +1 -0

index c25d2bf67b..d0153d4df6 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y

nitrogen6q_defconfig +1 -0

index 65d75910b6..bf12cbde80 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y

novena_defconfig +1 -0

index 3e1f0d8814..a42ce50a2a 100644
@@ -36,6 +36,7 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

ot1200_defconfig +1 -0

index bc37f89f48..0c3258ff1b 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_CMD_PCA953X=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

ot1200_spl_defconfig +1 -0

index 518483c5d9..ac96221ebf 100644
@@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_CMD_PCA953X=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

tbs2910_defconfig +1 -0

index 1152b69c72..5adcd9d986 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_PCI=y
 CONFIG_DM_THERMAL=y

udoo_defconfig +1 -0

index b92b181d4f..52cfdb009c 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y

wandboard_defconfig +1 -0

index 4b6b9d9aae..3c277772c0 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
+CONFIG_DWC_AHSATA=y
 CONFIG_PHYLIB=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y

ata/Kconfig +6 -0

index 2eab570b35..25ef5cef02 100644
@@ -47,6 +47,12 @@ config DWC_AHCI
 	  Enable this driver to support Sata devices through
 	  Synopsys DWC AHCI module.
 
+config DWC_AHSATA
+	bool "Enable DWC AHSATA driver support"
+	help
+	  Enable this driver to support the DWC AHSATA SATA controller found
+	  in i.MX5 and i.MX6 SoCs.
+
 config FSL_SATA
 	bool "Enable Freescale SATA controller driver support"
 	help

configs/advantech_dms-ba16.h +0 -1

index 09f470c6b5..34daf14db3 100644
@@ -39,7 +39,6 @@
 #define CONFIG_MXC_OCOTP
 
 /* SATA Configs */
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/apalis_imx6.h +0 -1

index 5a51f3c556..c32c5607d6 100644
@@ -70,7 +70,6 @@
  * SATA Configs
  */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/cgtqmx6eval.h +0 -1

index 2e8993d7d4..d24d9a45f1 100644
@@ -81,7 +81,6 @@
 #define CONFIG_IMX_HDMI
 
 /* SATA */
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/cm_fx6.h +0 -1

index da3233e965..b6164ca66d 100644
@@ -211,7 +211,6 @@
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_LIBATA
 #define CONFIG_LBA48
-#define CONFIG_DWC_AHSATA
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/dh_imx6.h +0 -1

index 11a01d476f..b988a19646 100644
@@ -84,7 +84,6 @@
 
 /* SATA Configs */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/ge_bx50v3.h +0 -1

index 33f5101c14..a522120de6 100644
@@ -51,7 +51,6 @@
 
 /* SATA Configs */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/gw_ventana.h +0 -1

index 05c88b3ef8..e68ddbcc2a 100644
@@ -102,7 +102,6 @@
  * SATA Configs
  */
 #ifdef CONFIG_CMD_SATA
-  #define CONFIG_DWC_AHSATA
   #define CONFIG_SYS_SATA_MAX_DEVICE	1
   #define CONFIG_DWC_AHSATA_PORT_ID	0
   #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/m53evk.h +0 -1

index 29eb59a3cb..c1634e53bf 100644
@@ -141,7 +141,6 @@
  * SATA
  */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_BASE_ADDR

configs/mx53loco.h +0 -1

index e973b35698..0c5e9831ae 100644
@@ -182,7 +182,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
 #ifdef CONFIG_CMD_SATA
-	#define CONFIG_DWC_AHSATA
 	#define CONFIG_SYS_SATA_MAX_DEVICE      1
 	#define CONFIG_DWC_AHSATA_PORT_ID       0
 	#define CONFIG_DWC_AHSATA_BASE_ADDR     SATA_BASE_ADDR

configs/mx6cuboxi.h +0 -1

index 6b42b2b3c1..392f9529de 100644
@@ -23,7 +23,6 @@
 
 /* SATA Configuration */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE      1
 #define CONFIG_DWC_AHSATA_PORT_ID       0
 #define CONFIG_DWC_AHSATA_BASE_ADDR     SATA_ARB_BASE_ADDR

configs/nitrogen6x.h +0 -1

index b847906310..faf21cb5ae 100644
@@ -49,7 +49,6 @@
  * SATA Configs
  */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/novena.h +0 -1

index dd0e637062..736ac931e4 100644
@@ -108,7 +108,6 @@
 
 /* SATA Configs */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/ot1200.h +0 -1

index 55e716a22a..1146838f34 100644
@@ -59,7 +59,6 @@
  * SATA Configs
  */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/tbs2910.h +0 -1

index 849d4a6aec..281809d87a 100644
@@ -78,7 +78,6 @@
 
 /* SATA */
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/udoo.h +0 -1

index bcce41db8a..f21ee521cc 100644
@@ -25,7 +25,6 @@
 /* SATA Configs */
 
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/wandboard.h +0 -1

index 97d193ba49..2155358561 100644
@@ -26,7 +26,6 @@
 /* SATA Configs */
 
 #ifdef CONFIG_CMD_SATA
-#define CONFIG_DWC_AHSATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

config_whitelist.txt +0 -1

index db2e6d28f9..94b758a4dd 100644
@@ -492,7 +492,6 @@ CONFIG_DWC2_ULPI_FS_LS
 CONFIG_DWC2_UTMI_WIDTH
 CONFIG_DWCDDR21MCTL
 CONFIG_DWCDDR21MCTL_BASE
-CONFIG_DWC_AHSATA
 CONFIG_DWC_AHSATA_BASE_ADDR
 CONFIG_DWC_AHSATA_PORT_ID
 CONFIG_DW_ALTDESCRIPTOR

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:26 UTC #14 lore raw

PATCH 7/10 ata: Migrate CONFIG_DWC_AHSATA to Kconfig

Quoted 1 line · Tuomas Tynkkynen

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

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/91c5de78/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #15 lore raw

PATCH 8/10 ata: Migrate CONFIG_SCSI_AHCI to Kconfig

In reply to Tuomas Tynkkynen

And use 'imply' liberally.

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

---
 arch/arm/Kconfig                              | 3 +++
 arch/arm/cpu/armv7/ls102xa/Kconfig            | 1 +
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig     | 2 ++
 arch/arm/include/asm/arch-ls102xa/config.h    | 1 -
 arch/x86/cpu/baytrail/Kconfig                 | 1 +
 arch/x86/cpu/braswell/Kconfig                 | 1 +
 arch/x86/cpu/broadwell/Kconfig                | 1 +
 arch/x86/cpu/coreboot/Kconfig                 | 1 +
 arch/x86/cpu/ivybridge/Kconfig                | 1 +
 arch/x86/cpu/qemu/Kconfig                     | 1 +
 arch/x86/cpu/queensbay/Kconfig                | 1 +
 configs/A10-OLinuXino-Lime_defconfig          | 1 +
 configs/A20-OLinuXino-Lime2-eMMC_defconfig    | 1 +
 configs/A20-OLinuXino-Lime2_defconfig         | 1 +
 configs/A20-OLinuXino-Lime_defconfig          | 1 +
 configs/A20-OLinuXino_MICRO-eMMC_defconfig    | 1 +
 configs/A20-OLinuXino_MICRO_defconfig         | 1 +
 configs/A20-Olimex-SOM-EVB_defconfig          | 1 +
 configs/Bananapi_M2_Ultra_defconfig           | 1 +
 configs/Bananapi_defconfig                    | 1 +
 configs/Bananapro_defconfig                   | 1 +
 configs/Cubieboard2_defconfig                 | 1 +
 configs/Cubieboard_defconfig                  | 1 +
 configs/Cubietruck_defconfig                  | 1 +
 configs/Itead_Ibox_A20_defconfig              | 1 +
 configs/Lamobo_R1_defconfig                   | 1 +
 configs/Linksprite_pcDuino3_Nano_defconfig    | 1 +
 configs/Linksprite_pcDuino3_defconfig         | 1 +
 configs/MPC8544DS_defconfig                   | 1 +
 configs/MPC8572DS_36BIT_defconfig             | 1 +
 configs/MPC8572DS_defconfig                   | 1 +
 configs/MPC8610HPCD_defconfig                 | 1 +
 configs/MPC8641HPCN_36BIT_defconfig           | 1 +
 configs/MPC8641HPCN_defconfig                 | 1 +
 configs/Marsboard_A10_defconfig               | 1 +
 configs/Mele_A1000_defconfig                  | 1 +
 configs/Mele_M5_defconfig                     | 1 +
 configs/Orangepi_defconfig                    | 1 +
 configs/Orangepi_mini_defconfig               | 1 +
 configs/Wits_Pro_A20_DKT_defconfig            | 1 +
 configs/am57xx_evm_defconfig                  | 1 +
 configs/am57xx_hs_evm_defconfig               | 1 +
 configs/bananapi_m1_plus_defconfig            | 1 +
 configs/cl-som-am57x_defconfig                | 1 +
 configs/cm_t54_defconfig                      | 1 +
 configs/controlcenterdc_defconfig             | 1 +
 configs/db-88f6820-gp_defconfig               | 1 +
 configs/highbank_defconfig                    | 1 +
 configs/ls1012aqds_qspi_defconfig             | 1 +
 configs/ls1088aqds_qspi_defconfig             | 1 +
 configs/ls1088aqds_sdcard_qspi_defconfig      | 1 +
 configs/ls1088ardb_qspi_defconfig             | 1 +
 configs/ls1088ardb_sdcard_qspi_defconfig      | 1 +
 configs/ls2081ardb_defconfig                  | 1 +
 configs/mvebu_db-88f3720_defconfig            | 1 +
 configs/mvebu_db_armada8k_defconfig           | 1 +
 configs/mvebu_espressobin-88f3720_defconfig   | 1 +
 configs/mvebu_mcbin-88f8040_defconfig         | 1 +
 configs/omap5_uevm_defconfig                  | 1 +
 configs/qemu_arm_defconfig                    | 1 +
 configs/turris_omnia_defconfig                | 1 +
 configs/xilinx_zynqmp_ep_defconfig            | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig   | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig   | 1 +
 drivers/ata/Kconfig                           | 5 +++++
 include/configs/MPC8544DS.h                   | 1 -
 include/configs/MPC8572DS.h                   | 1 -
 include/configs/MPC8610HPCD.h                 | 2 --
 include/configs/MPC8641HPCN.h                 | 2 --
 include/configs/am57xx_evm.h                  | 1 -
 include/configs/cl-som-am57x.h                | 1 -
 include/configs/cm_t54.h                      | 1 -
 include/configs/controlcenterdc.h             | 1 -
 include/configs/db-88f6820-gp.h               | 1 -
 include/configs/dra7xx_evm.h                  | 1 -
 include/configs/efi-x86.h                     | 2 --
 include/configs/galileo.h                     | 3 ---
 include/configs/highbank.h                    | 1 -
 include/configs/ls1012aqds.h                  | 1 -
 include/configs/ls1012ardb.h                  | 1 -
 include/configs/ls1021aiot.h                  | 1 -
 include/configs/ls1043aqds.h                  | 1 -
 include/configs/ls1043ardb.h                  | 1 -
 include/configs/ls1046aqds.h                  | 1 -
 include/configs/ls1046ardb.h                  | 1 -
 include/configs/ls1088a_common.h              | 1 -
 include/configs/ls2080aqds.h                  | 1 -
 include/configs/ls2080ardb.h                  | 1 -
 include/configs/mvebu_armada-37xx.h           | 1 -
 include/configs/mvebu_armada-8k.h             | 1 -
 include/configs/omap5_uevm.h                  | 1 -
 include/configs/qemu-arm.h                    | 1 -
 include/configs/sbc8641d.h                    | 2 --
 include/configs/sunxi-common.h                | 1 -
 include/configs/turris_omnia.h                | 1 -
 include/configs/x86-common.h                  | 2 --
 include/configs/xilinx_zynqmp.h               | 1 -
 scripts/config_whitelist.txt                  | 1 -
 99 files changed, 72 insertions(+), 41 deletions(-)

arm/Kconfig +3 -0

index e50ba930a1..73909952d0 100644
@@ -850,6 +850,7 @@ config TARGET_LS2080AQDS
 	select SUPPORT_SPL
 	select ARCH_MISC_INIT
 	imply SCSI
+	imply SCSI_AHCI
 	help
 	  Support for Freescale LS2080AQDS platform
 	  The LS2080A Development System (QDS) is a high-performance

@@ -865,6 +866,7 @@ config TARGET_LS2080ARDB
 	select SUPPORT_SPL
 	select ARCH_MISC_INIT
 	imply SCSI
+	imply SCSI_AHCI
 	help
 	  Support for Freescale LS2080ARDB platform.
 	  The LS2080A Reference design board (RDB) is a high-performance

@@ -926,6 +928,7 @@ config TARGET_LS1012ARDB
 	select ARM64
 	select BOARD_LATE_INIT
 	imply SCSI
+	imply SCSI_AHCI
 	help
 	  Support for Freescale LS1012ARDB platform.
 	  The LS1012A Reference design board (RDB) is a high-performance

arm/cpu/armv7/ls102xa/Kconfig +1 -0

index 20e2b1a50a..635358e328 100644
@@ -20,6 +20,7 @@ config ARCH_LS1021A
 	select SYS_FSL_SEC_COMPAT_5
 	select SYS_FSL_SEC_LE
 	imply SCSI
+	imply SCSI_AHCI
 	imply CMD_PCI
 
 menu "LS102xA architecture"

arm/cpu/armv8/fsl-layerscape/Kconfig +2 -0

index 5daf79e919..aea71b4f46 100644
@@ -31,6 +31,7 @@ config ARCH_LS1043A
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
 	imply SCSI
+	imply SCSI_AHCI
 	imply CMD_PCI
 
 config ARCH_LS1046A

@@ -57,6 +58,7 @@ config ARCH_LS1046A
 	select ARCH_EARLY_INIT_R
 	select BOARD_EARLY_INIT_F
 	imply SCSI
+	imply SCSI_AHCI
 
 config ARCH_LS1088A
 	bool

arm/include/asm/arch-ls102xa/config.h +0 -1

index ff0fc47021..2fbd4ef557 100644
@@ -81,7 +81,6 @@
 /* SATA */
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

x86/cpu/baytrail/Kconfig +1 -0

index 1d876b1927..f47bedaf8d 100644
@@ -19,6 +19,7 @@ config INTEL_BAYTRAIL
 	imply MMC_SDHCI
 	imply MMC_SDHCI_SDMA
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply SYS_NS16550
 	imply USB

x86/cpu/braswell/Kconfig +1 -0

index 31ac279c56..042ad2bf51 100644
@@ -19,6 +19,7 @@ config INTEL_BRASWELL
 	imply MMC_SDHCI
 	imply MMC_SDHCI_SDMA
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply SYS_NS16550
 	imply USB

x86/cpu/broadwell/Kconfig +1 -0

index bc2dba2bd7..42018dc127 100644
@@ -13,6 +13,7 @@ config INTEL_BROADWELL
 	imply ICH_SPI
 	imply INTEL_BROADWELL_GPIO
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply USB
 	imply USB_EHCI_HCD

x86/cpu/coreboot/Kconfig +1 -0

index 60eb45f9d0..fa3b64f2bb 100644
@@ -10,6 +10,7 @@ config SYS_COREBOOT
 	imply MMC_PCI
 	imply MMC_SDHCI
 	imply MMC_SDHCI_SDMA
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply SYS_NS16550
 	imply USB

x86/cpu/ivybridge/Kconfig +1 -0

index c214ea0efe..85ea6c91f3 100644
@@ -14,6 +14,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE
 	imply ICH_SPI
 	imply INTEL_ICH6_GPIO
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply USB
 	imply USB_EHCI_HCD

x86/cpu/qemu/Kconfig +1 -0

index 81444f3d9e..0a801aabea 100644
@@ -9,6 +9,7 @@ config QEMU
 	select ARCH_EARLY_INIT_R
 	imply AHCI_PCI
 	imply E1000
+	imply SCSI_AHCI
 	imply SYS_NS16550
 	imply USB
 	imply USB_EHCI_HCD

x86/cpu/queensbay/Kconfig +1 -0

index 835de85268..460ede00bc 100644
@@ -18,6 +18,7 @@ config INTEL_QUEENSBAY
 	imply MMC_SDHCI_SDMA
 	imply PCH_GBE
 	imply SCSI
+	imply SCSI_AHCI
 	imply SPI_FLASH
 	imply SYS_NS16550
 	imply USB

A10-OLinuXino-Lime_defconfig +1 -0

index 30e846cf48..ff1d35bd77 100644
@@ -17,6 +17,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800
 CONFIG_AXP_ALDO4_VOLT=2800

A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index cd1fa64ecb..97f2e7d345 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_DFU_RAM=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y

A20-OLinuXino-Lime2_defconfig +1 -0

index 4a90ab695a..2916112f14 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_DFU_RAM=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y

A20-OLinuXino-Lime_defconfig +1 -0

index 08b301a483..4d94548a76 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800

A20-OLinuXino_MICRO-eMMC_defconfig +1 -0

index 2ff2723065..586e6abab0 100644
@@ -17,6 +17,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800

A20-OLinuXino_MICRO_defconfig +1 -0

index 1a0ad5a6d4..4abac45de5 100644
@@ -18,6 +18,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_AXP_ALDO3_VOLT=2800

A20-Olimex-SOM-EVB_defconfig +1 -0

index ee9415517f..25ddce514b 100644
@@ -19,6 +19,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

Bananapi_M2_Ultra_defconfig +1 -0

index 4c2c05c4da..8083510274 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_AXP_DLDO4_VOLT=2500
 CONFIG_AXP_ELDO3_VOLT=1200
 CONFIG_SCSI=y

Bananapi_defconfig +1 -0

index a5456127e2..5265044809 100644
@@ -16,6 +16,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_NETCONSOLE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

Bananapro_defconfig +1 -0

index 5c8e759498..fbf18ae1e1 100644
@@ -18,6 +18,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_NETCONSOLE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

Cubieboard2_defconfig +1 -0

index ef95ac6a5e..594714ef07 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_SCSI=y

Cubieboard_defconfig +1 -0

index c670ab851a..8c1c1334e7 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y

Cubietruck_defconfig +1 -0

index f9f73fdb23..8da593be6a 100644
@@ -22,6 +22,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_DFU_RAM=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y

Itead_Ibox_A20_defconfig +1 -0

index 8f7ee1d55f..cd388a9aee 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_SCSI=y

Lamobo_R1_defconfig +1 -0

index 84007ad374..4cc4dc4b16 100644
@@ -16,6 +16,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

Linksprite_pcDuino3_Nano_defconfig +1 -0

index 08749b8f75..13538fafd1 100644
@@ -16,6 +16,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

Linksprite_pcDuino3_defconfig +1 -0

index a54f9de3a6..1392d1f4ac 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_MMC=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y

MPC8544DS_defconfig +1 -0

index 6e30ac45f0..4f9219b7ea 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y

MPC8572DS_36BIT_defconfig +1 -0

index bce08d139e..14e2933f5b 100644
@@ -18,6 +18,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SYS_FSL_DDR2=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

MPC8572DS_defconfig +1 -0

index 9dd7c735d1..86546f068e 100644
@@ -17,6 +17,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_HASH is not set
 CONFIG_CMD_EXT2=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SYS_FSL_DDR2=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

MPC8610HPCD_defconfig +1 -0

index 40256c8708..cb2e06377d 100644
@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SCSI=y

MPC8641HPCN_36BIT_defconfig +1 -0

index d51bdf3b9e..a85ecfb976 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y

MPC8641HPCN_defconfig +1 -0

index dd2a92b691..72ff192a52 100644
@@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHYLIB=y

Marsboard_A10_defconfig +1 -0

index 8bce411663..e79c3a2245 100644
@@ -10,6 +10,7 @@ CONFIG_SPL=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_SUNXI_NO_PMIC=y
 CONFIG_SCSI=y

Mele_A1000_defconfig +1 -0

index 24a4aff478..d51ee9d91f 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y

Mele_M5_defconfig +1 -0

index 84c83dab2e..b4a1964629 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_SUN7I_GMAC=y
 CONFIG_SCSI=y

Orangepi_defconfig +1 -0

index d39cc66d85..50dd0fc32c 100644
@@ -18,6 +18,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

Orangepi_mini_defconfig +1 -0

index 17f825f241..6f3782c105 100644
@@ -20,6 +20,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

Wits_Pro_A20_DKT_defconfig +1 -0

index 2e96ba2a52..a16e363000 100644
@@ -18,6 +18,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

am57xx_evm_defconfig +1 -0

index 6e4d04c13b..fc96401d3e 100644
@@ -39,6 +39,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

am57xx_hs_evm_defconfig +1 -0

index e36491086f..681e2a54c8 100644
@@ -42,6 +42,7 @@ CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_BLK is not set
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

bananapi_m1_plus_defconfig +1 -0

index 79ff0aaed2..efe15459bc 100644
@@ -16,6 +16,7 @@ CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_SPL_ISO_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_NETCONSOLE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_RGMII=y
 CONFIG_SUN7I_GMAC=y

cl-som-am57x_defconfig +1 -0

index 8f0a7f68ce..9c3031bac8 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_CMD_PCA953X=y
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS_GPIO=y

cm_t54_defconfig +1 -0

index 69b1cbfdfe..ca80f18e77 100644
@@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SCSI_AHCI=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y

controlcenterdc_defconfig +1 -0

index f65e525934..856591e2c8 100644
@@ -35,6 +35,7 @@ CONFIG_EFI_PARTITION=y
 CONFIG_OF_BOARD_FIXUP=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y

db-88f6820-gp_defconfig +1 -0

index beac266189..5cc27813b0 100644
@@ -38,6 +38,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_MV=y

highbank_defconfig +1 -0

index 20a7b71737..f55b5dcebd 100644
@@ -23,6 +23,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_NVRAM=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_MMC is not set
 CONFIG_SCSI=y
 CONFIG_OF_LIBFDT=y

ls1012aqds_qspi_defconfig +1 -0

index 4073db6583..0435d51dc4 100644
@@ -34,6 +34,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 # CONFIG_BLK is not set
 CONFIG_DM_MMC=y
 CONFIG_DM_SPI_FLASH=y

ls1088aqds_qspi_defconfig +1 -0

index 850be3ebc9..1e368d7b6a 100644
@@ -20,6 +20,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y

ls1088aqds_sdcard_qspi_defconfig +1 -0

index 2313d28a19..0ba698168b 100644
@@ -30,6 +30,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y

ls1088ardb_qspi_defconfig +1 -0

index 599ee15968..044e00d385 100644
@@ -18,6 +18,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y

ls1088ardb_sdcard_qspi_defconfig +1 -0

index 14910da72d..b0d354b68e 100644
@@ -28,6 +28,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y

ls2081ardb_defconfig +1 -0

index 1ab8f18cd3..e532032840 100644
@@ -25,6 +25,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
+CONFIG_SCSI_AHCI=y
 CONFIG_FSL_CAAM=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y

mvebu_db-88f3720_defconfig +1 -0

index 0fd4514c37..283a964f24 100644
@@ -36,6 +36,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_GPIO=y
 # CONFIG_MVEBU_GPIO is not set

mvebu_db_armada8k_defconfig +1 -0

index 2e2e0bcb44..ab949c1952 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_MVEBU_BUBT=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MVTWSI=y

mvebu_espressobin-88f3720_defconfig +1 -0

index 95db6c610e..d99c4f52d9 100644
@@ -35,6 +35,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y

mvebu_mcbin-88f8040_defconfig +1 -0

index c0d1881ff8..29f134df1d 100644
@@ -31,6 +31,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SCSI_AHCI=y
 CONFIG_BLOCK_CACHE=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y

omap5_uevm_defconfig +1 -0

index acf8962201..b3c6fa9cf1 100644
@@ -33,6 +33,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_CMD_TCA642X=y

qemu_arm_defconfig +1 -0

index f353eea691..3cd4d45433 100644
@@ -8,6 +8,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_OF_BOARD=y
+CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 CONFIG_BLK=y
 # CONFIG_MMC is not set

turris_omnia_defconfig +1 -0

index b9b5cbc2c5..ffb26cdac3 100644
@@ -29,6 +29,7 @@ CONFIG_CMD_BTRFS=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SCSI_AHCI=y
 CONFIG_MISC=y
 CONFIG_ATSHA204A=y
 CONFIG_MMC_SDHCI=y

xilinx_zynqmp_ep_defconfig +1 -0

index ff865f1bdc..ee9528caec 100644
@@ -49,6 +49,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y

xilinx_zynqmp_zcu102_rev1_0_defconfig +1 -0

index bf27ca48db..158dc7ed8c 100644
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y

xilinx_zynqmp_zcu102_revA_defconfig +1 -0

index 80c5e49348..01e956cbc9 100644
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y

xilinx_zynqmp_zcu102_revB_defconfig +1 -0

index 232532c995..ab2f0a830a 100644
@@ -42,6 +42,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
 CONFIG_SATA_CEVA=y
 CONFIG_DFU_RAM=y
 CONFIG_FPGA_XILINX=y

ata/Kconfig +5 -0

index 25ef5cef02..38318b4615 100644
@@ -20,6 +20,11 @@ config SATA
 
 	  See also CMD_SATA which provides command-line support.
 
+config SCSI_AHCI
+	bool "Enable SCSI interface to SATA devices"
+	help
+	  Enable this to allow interfacing SATA devices via the SCSI layer.
+
 menu "SATA/SCSI device support"
 
 config AHCI_PCI

configs/MPC8544DS.h +0 -1

index 2aea8928ee..4332941779 100644
@@ -282,7 +282,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA

configs/MPC8572DS.h +0 -1

index b277cdb1c6..0ad13d2c63 100644
@@ -469,7 +469,6 @@
 #endif
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
-#define CONFIG_SCSI_AHCI
 
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA

configs/MPC8610HPCD.h +0 -2

index e7b59a3d65..befd3f776e 100644
@@ -281,8 +281,6 @@
 #define PCI_IDSEL_NUMBER	0x0c	/* slot0->3(IDSEL)=12->15 */
 #endif
 
-#define CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288

configs/MPC8641HPCN.h +0 -2

index 298fe5a63d..882c4c271b 100644
@@ -373,8 +373,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
-#define CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288

configs/am57xx_evm.h +0 -1

index dc05bea05e..2ebe0f50bf 100644
@@ -97,7 +97,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/cl-som-am57x.h +0 -1

index a3b40ab196..7115bb8111 100644
@@ -63,7 +63,6 @@
 #ifndef CONFIG_SPL_BUILD
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/cm_t54.h +0 -1

index 9152c71717..f756e77c06 100644
@@ -48,7 +48,6 @@
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
 
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/controlcenterdc.h +0 -1

index 715e9ed9c9..92f3619992 100644
@@ -49,7 +49,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/db-88f6820-gp.h +0 -1

index 44fd968d3b..672bfbc946 100644
@@ -45,7 +45,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/dra7xx_evm.h +0 -1

index f84c1f0146..4b622365ae 100644
@@ -149,7 +149,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/efi-x86.h +0 -2

index 43935bf4b4..b027615139 100644
@@ -11,8 +11,6 @@
 
 #undef CONFIG_TPM_TIS_BASE_ADDRESS
 
-#undef CONFIG_SCSI_AHCI
-
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
 					"stdout=vga,serial\0" \
 					"stderr=vga,serial\0"

configs/galileo.h +0 -3

index 00c5434125..cf798d07e7 100644
@@ -22,9 +22,6 @@
 					"stdout=serial\0" \
 					"stderr=serial\0"
 
-/* SATA is not supported in Quark SoC */
-#undef CONFIG_SCSI_AHCI
-
 /* 10/100M Ethernet support */
 #define CONFIG_DESIGNWARE_ETH
 #define CONFIG_DW_ALTDESCRIPTOR

configs/highbank.h +0 -1

index b2b2c2500a..544e38ff3a 100644
@@ -34,7 +34,6 @@
 
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	5
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/ls1012aqds.h +0 -1

index d15054709e..5410549ce6 100644
@@ -126,7 +126,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR

configs/ls1012ardb.h +0 -1

index 794117062f..1659fc5a76 100644
@@ -41,7 +41,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR

configs/ls1021aiot.h +0 -1

index 46bf55f891..cc76c4e5e8 100644
@@ -128,7 +128,6 @@
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
 #define PCI_DEVICE_ID_FREESCALE_AHCI	0x0440

configs/ls1043aqds.h +0 -1

index 8cc2abb2b6..a63e9f4981 100644
@@ -95,7 +95,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 /* EEPROM */

configs/ls1043ardb.h +0 -1

index b4b4d5e178..9e71e8f430 100644
@@ -287,7 +287,6 @@
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #ifndef CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT2
 #endif

configs/ls1046aqds.h +0 -1

index 1713e2c031..74b1c1127b 100644
@@ -138,7 +138,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 /* EEPROM */

configs/ls1046ardb.h +0 -1

index d001b80270..f143a9ea3f 100644
@@ -212,7 +212,6 @@
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR

configs/ls1088a_common.h +0 -1

index 6b71d47c5a..602c5745ca 100644
@@ -157,7 +157,6 @@ unsigned long long get_qixis_addr(void);
 /* SATA */
 #ifdef CONFIG_SCSI
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SATA1		AHCI_BASE_ADDR1

configs/ls2080aqds.h +0 -1

index f1968cc533..0a14cf48cf 100644
@@ -47,7 +47,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1

configs/ls2080ardb.h +0 -1

index 650db2f594..ab9c4ef8c3 100644
@@ -65,7 +65,6 @@ unsigned long get_board_sys_clk(void);
 
 /* SATA */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1

configs/mvebu_armada-37xx.h +0 -1

index 1b2e0d71b4..52d4944554 100644
@@ -96,7 +96,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

configs/mvebu_armada-8k.h +0 -1

index d85527434a..c2b2d12678 100644
@@ -96,7 +96,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

configs/omap5_uevm.h +0 -1

index 38d7412099..124657f61a 100644
@@ -62,7 +62,6 @@
 #define CONSOLEDEV		"ttyO2"
 
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/qemu-arm.h +0 -1

index 4376a24787..69e886b43e 100644
@@ -31,7 +31,6 @@
 
 /* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
-#define CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 
 /* Environment options */

configs/sbc8641d.h +0 -2

index a0097fdbd9..817c9d920d 100644
@@ -300,8 +300,6 @@
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
-#undef CONFIG_SCSI_AHCI
-
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4

configs/sunxi-common.h +0 -1

index 4391a8cbc8..5ffd69664c 100644
@@ -114,7 +114,6 @@
 
 #ifdef CONFIG_AHCI
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SUNXI_AHCI
 #define CONFIG_SYS_64BIT_LBA

configs/turris_omnia.h +0 -1

index d2c3e57570..7a7a157bbb 100644
@@ -54,7 +54,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/x86-common.h +0 -2

index 6422852010..5554df9484 100644
@@ -28,8 +28,6 @@
 #define CONFIG_SYS_BOOTM_LEN		(16 << 20)
 
 /* SATA AHCI storage */
-
-#define CONFIG_SCSI_AHCI
 #ifdef CONFIG_SCSI_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_LBA48

configs/xilinx_zynqmp.h +0 -1

index 14604eb4e8..493e3e30d5 100644
@@ -158,7 +158,6 @@
 
 #ifdef CONFIG_SATA_CEVA
 #define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \

config_whitelist.txt +0 -1

index 94b758a4dd..67feedfbf2 100644
@@ -1911,7 +1911,6 @@ CONFIG_SCIF
 CONFIG_SCIF_A
 CONFIG_SCIF_EXT_CLOCK
 CONFIG_SCIF_USE_EXT_CLK
-CONFIG_SCSI_AHCI
 CONFIG_SCSI_AHCI_PLAT
 CONFIG_SCSI_DEV_LIST
 CONFIG_SC_TIMER_CLK

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:26 UTC #16 lore raw

PATCH 8/10 ata: Migrate CONFIG_SCSI_AHCI to Kconfig

Quoted 3 lines · Tuomas Tynkkynen

And use 'imply' liberally.
Signed-off-by Tuomas Tynkkynen <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/4ae64eb7/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #17 lore raw

PATCH 9/10 ata: Migrate CONFIG_LIBATA to Kconfig

In reply to Tuomas Tynkkynen

This symbol enables some library code used by various SATA drivers, so make this a non-user-visible symbol select'ed by the respective drivers, and let moveconfig handle the rest.

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

---
 arch/arm/include/asm/arch-ls102xa/config.h |  1 -
 drivers/ata/Kconfig                        | 11 +++++++++++
 include/configs/MPC8315ERDB.h              |  2 --
 include/configs/MPC8349ITX.h               |  1 -
 include/configs/MPC837XEMDS.h              |  2 --
 include/configs/MPC837XERDB.h              |  2 --
 include/configs/MPC8536DS.h                |  2 --
 include/configs/MPC8544DS.h                |  1 -
 include/configs/MPC8572DS.h                |  1 -
 include/configs/MPC8610HPCD.h              |  1 -
 include/configs/MPC8641HPCN.h              |  1 -
 include/configs/P1010RDB.h                 |  1 -
 include/configs/P1022DS.h                  |  1 -
 include/configs/P2041RDB.h                 |  2 --
 include/configs/P4080DS.h                  |  1 -
 include/configs/T102xQDS.h                 |  1 -
 include/configs/T1040QDS.h                 |  2 --
 include/configs/T104xRDB.h                 |  2 --
 include/configs/T208xQDS.h                 |  1 -
 include/configs/T208xRDB.h                 |  1 -
 include/configs/T4240QDS.h                 |  2 --
 include/configs/T4240RDB.h                 |  4 ----
 include/configs/UCP1020.h                  |  1 -
 include/configs/advantech_dms-ba16.h       |  1 -
 include/configs/am57xx_evm.h               |  1 -
 include/configs/apalis_imx6.h              |  1 -
 include/configs/cgtqmx6eval.h              |  1 -
 include/configs/cl-som-am57x.h             |  1 -
 include/configs/cm_fx6.h                   |  1 -
 include/configs/cm_t54.h                   |  1 -
 include/configs/controlcenterd.h           |  1 -
 include/configs/controlcenterdc.h          |  1 -
 include/configs/corenet_ds.h               |  2 --
 include/configs/cyrus.h                    |  2 --
 include/configs/db-88f6820-gp.h            |  1 -
 include/configs/db-mv784mp-gp.h            |  1 -
 include/configs/dh_imx6.h                  |  1 -
 include/configs/dra7xx_evm.h               |  1 -
 include/configs/ge_bx50v3.h                |  1 -
 include/configs/gw_ventana.h               |  1 -
 include/configs/highbank.h                 |  1 -
 include/configs/ls1012aqds.h               |  1 -
 include/configs/ls1012ardb.h               |  1 -
 include/configs/ls1021aiot.h               |  1 -
 include/configs/ls1043aqds.h               |  1 -
 include/configs/ls1043ardb.h               |  1 -
 include/configs/ls1046aqds.h               |  1 -
 include/configs/ls1046ardb.h               |  1 -
 include/configs/ls1088a_common.h           |  1 -
 include/configs/ls2080aqds.h               |  1 -
 include/configs/ls2080ardb.h               |  1 -
 include/configs/m53evk.h                   |  1 -
 include/configs/mvebu_armada-37xx.h        |  1 -
 include/configs/mvebu_armada-8k.h          |  1 -
 include/configs/mx53loco.h                 |  1 -
 include/configs/mx6cuboxi.h                |  1 -
 include/configs/nitrogen6x.h               |  1 -
 include/configs/novena.h                   |  1 -
 include/configs/omap5_uevm.h               |  1 -
 include/configs/ot1200.h                   |  1 -
 include/configs/p1_p2_rdb_pc.h             |  1 -
 include/configs/p1_twr.h                   |  1 -
 include/configs/qemu-arm.h                 |  1 -
 include/configs/sunxi-common.h             |  1 -
 include/configs/t4qds.h                    |  2 --
 include/configs/tbs2910.h                  |  1 -
 include/configs/theadorable.h              |  1 -
 include/configs/turris_omnia.h             |  1 -
 include/configs/udoo.h                     |  1 -
 include/configs/wandboard.h                |  1 -
 include/configs/x86-common.h               |  1 -
 include/configs/xilinx_zynqmp.h            |  1 -
 scripts/config_whitelist.txt               |  1 -
 73 files changed, 11 insertions(+), 86 deletions(-)

arm/include/asm/arch-ls102xa/config.h +0 -1

index 2fbd4ef557..940461137e 100644
@@ -80,7 +80,6 @@
 
 /* SATA */
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID		1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

ata/Kconfig +11 -0

index 38318b4615..43e6626969 100644
@@ -20,8 +20,14 @@ config SATA
 
 	  See also CMD_SATA which provides command-line support.
 
+config LIBATA
+	bool
+	help
+	  Select this to build and link the libata helper functions.
+
 config SCSI_AHCI
 	bool "Enable SCSI interface to SATA devices"
+	select LIBATA
 	help
 	  Enable this to allow interfacing SATA devices via the SCSI layer.

@@ -54,30 +60,35 @@ config DWC_AHCI
 
 config DWC_AHSATA
 	bool "Enable DWC AHSATA driver support"
+	select LIBATA
 	help
 	  Enable this driver to support the DWC AHSATA SATA controller found
 	  in i.MX5 and i.MX6 SoCs.
 
 config FSL_SATA
 	bool "Enable Freescale SATA controller driver support"
+	select LIBATA
 	help
 	  Enable this driver to support the SATA controller found in
 	  some Freescale PowerPC SoCs.
 
 config SATA_MV
 	bool "Enable Marvell SATA controller driver support"
+	select LIBATA
 	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"
+	select LIBATA
 	help
 	  Enable this driver to support the SIL3131, SIL3132 and SIL3124
 	  SATA controllers.
 
 config SATA_SIL3114
 	bool "Enable Silicon Image SIL3114 SATA driver support"
+	select LIBATA
 	help
 	  Enable this driver to support the SIL3114 SATA controllers.

configs/MPC8315ERDB.h +0 -2

index a23c4ef522..bd1a7b2679 100644
@@ -395,8 +395,6 @@
 /*
  * SATA
  */
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1_OFFSET	0x18000

configs/MPC8349ITX.h +0 -1

index 23fe158f74..c88aa95632 100644
@@ -138,7 +138,6 @@
 #ifdef CONFIG_SATA_SIL3114
 
 #define CONFIG_SYS_SATA_MAX_DEVICE      4
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 
 #endif

configs/MPC837XEMDS.h +0 -2

index f0b856c2c8..3cc1a4717b 100644
@@ -420,8 +420,6 @@ extern int board_pci_host_broken(void);
 /*
  * SATA
  */
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1_OFFSET	0x18000

configs/MPC837XERDB.h +0 -2

index d865c22644..656180f91a 100644
@@ -434,8 +434,6 @@
 /*
  * SATA
  */
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1_OFFSET	0x18000

configs/MPC8536DS.h +0 -2

index d060e8c235..7587225bda 100644
@@ -508,8 +508,6 @@
 #endif	/* CONFIG_PCI */
 
 /* SATA */
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/MPC8544DS.h +0 -1

index 4332941779..bec8a09b5f 100644
@@ -284,7 +284,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
 #define CONFIG_SYS_SCSI_MAX_LUN	1

configs/MPC8572DS.h +0 -1

index 0ad13d2c63..ebc2e3aad4 100644
@@ -471,7 +471,6 @@
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
 #define CONFIG_SYS_SCSI_MAX_LUN	1

configs/MPC8610HPCD.h +0 -1

index befd3f776e..bd14bc0607 100644
@@ -282,7 +282,6 @@
 #endif
 
 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
 #define CONFIG_SYS_SCSI_MAX_LUN	1

configs/MPC8641HPCN.h +0 -1

index 882c4c271b..567111798b 100644
@@ -374,7 +374,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #undef CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SATA_ULI5288
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	4
 #define CONFIG_SYS_SCSI_MAX_LUN	1

configs/P1010RDB.h +0 -1

index 87c8962a9d..72b6e3ad6d 100644
@@ -635,7 +635,6 @@ extern unsigned long get_sdram_size(void);
 
 /* SATA */
 #define CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
 
 #ifdef CONFIG_FSL_SATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2

configs/P1022DS.h +0 -1

index 7d4ac61194..30e20bc6e4 100644
@@ -482,7 +482,6 @@
 #endif
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_FSL_SATA_V2
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2

configs/P2041RDB.h +0 -2

index 9046567baa..917e5d5a06 100644
@@ -527,8 +527,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_FSL_SATA_V2
 
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/P4080DS.h +0 -1

index 8b884411ac..117def9dc2 100644
@@ -13,7 +13,6 @@
 #define CONFIG_PCIE3
 
 #define CONFIG_SYS_SATA_MAX_DEVICE  2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 
 #define CONFIG_SYS_SRIO

configs/T102xQDS.h +0 -1

index 974717fde6..ed6df53916 100644
@@ -615,7 +615,6 @@ unsigned long get_board_ddr_clk(void);
  */
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T1040QDS.h +0 -2

index ac3d19301a..bc5c0d2e68 100644
@@ -500,8 +500,6 @@ unsigned long get_board_ddr_clk(void);
 /* SATA */
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T104xRDB.h +0 -2

index ebcae95722..3159c62004 100644
@@ -614,8 +614,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 /* SATA */
 #define CONFIG_FSL_SATA_V2
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T208xQDS.h +0 -1

index b19a677eb9..43fcc6f5dd 100644
@@ -678,7 +678,6 @@ unsigned long get_board_ddr_clk(void);
  * SATA
  */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T208xRDB.h +0 -1

index 66ce31bc0c..e1c57de2af 100644
@@ -628,7 +628,6 @@ unsigned long get_board_ddr_clk(void);
  * SATA
  */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T4240QDS.h +0 -2

index e2caa02f67..099e9e1d94 100644
@@ -468,8 +468,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/T4240RDB.h +0 -4

index 70705a7b49..98f8f4f10c 100644
@@ -240,8 +240,6 @@
 
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

@@ -634,8 +632,6 @@ unsigned long get_board_ddr_clk(void);
 
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/UCP1020.h +0 -1

index 455298751c..e8b1a74c64 100644
@@ -119,7 +119,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 
 #define CONFIG_SYS_CLK_FREQ	66666666

configs/advantech_dms-ba16.h +0 -1

index 34daf14db3..f370fe5b78 100644
@@ -43,7 +43,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 
 /* MMC Configs */
 #define CONFIG_FSL_ESDHC

configs/am57xx_evm.h +0 -1

index 2ebe0f50bf..28618a579c 100644
@@ -96,7 +96,6 @@
 #define CONFIG_OMAP_USB3PHY1_HOST
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/apalis_imx6.h +0 -1

index c32c5607d6..c4e93562b5 100644
@@ -74,7 +74,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* Network */

configs/cgtqmx6eval.h +0 -1

index d24d9a45f1..b50535f9b0 100644
@@ -85,7 +85,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 
 /* Ethernet */
 #define CONFIG_FEC_MXC

configs/cl-som-am57x.h +0 -1

index 7115bb8111..6935b06d5c 100644
@@ -62,7 +62,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/cm_fx6.h +0 -1

index b6164ca66d..5195610233 100644
@@ -209,7 +209,6 @@
 
 /* SATA */
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR

configs/cm_t54.h +0 -1

index f756e77c06..1351eb85f2 100644
@@ -47,7 +47,6 @@
 #define CONFIG_SPL_SATA_BOOT_DEVICE		0
 #define CONFIG_SYS_SATA_FAT_BOOT_PARTITION	1
 
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/controlcenterd.h +0 -1

index bb038f14c2..4312ddd4fc 100644
@@ -245,7 +245,6 @@
 /*
  * SATA
  */
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2

configs/controlcenterdc.h +0 -1

index 92f3619992..a882fa650b 100644
@@ -48,7 +48,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/corenet_ds.h +0 -2

index b49b826eb4..d0e8bfbed7 100644
@@ -541,8 +541,6 @@
 
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/cyrus.h +0 -2

index b6597034e2..4fea53bf79 100644
@@ -376,8 +376,6 @@
 
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/db-88f6820-gp.h +0 -1

index 672bfbc946..32f93f2f46 100644
@@ -44,7 +44,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/db-mv784mp-gp.h +0 -1

index 105578ffc6..3dcc28710b 100644
@@ -49,7 +49,6 @@
 
 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 
 /* Additional FS support/configuration */

configs/dh_imx6.h +0 -1

index b988a19646..fb49997ebd 100644
@@ -88,7 +88,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* SPI Flash Configs */

configs/dra7xx_evm.h +0 -1

index 4b622365ae..f777d576dd 100644
@@ -148,7 +148,6 @@
 #define CONFIG_OMAP_USB2PHY2_HOST
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/ge_bx50v3.h +0 -1

index a522120de6..1454577dbf 100644
@@ -55,7 +55,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* MMC Configs */

configs/gw_ventana.h +0 -1

index e68ddbcc2a..068962d613 100644
@@ -106,7 +106,6 @@
   #define CONFIG_DWC_AHSATA_PORT_ID	0
   #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
   #define CONFIG_LBA48
-  #define CONFIG_LIBATA
 #endif
 
 /*

configs/highbank.h +0 -1

index 544e38ff3a..a5a524008b 100644
@@ -33,7 +33,6 @@
 #define CONFIG_SYS_BOOTCOUNT_ADDR	0xfff3cf0c
 
 #define CONFIG_MISC_INIT_R
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	5
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/ls1012aqds.h +0 -1

index 5410549ce6..af5f37cca3 100644
@@ -125,7 +125,6 @@
 #endif
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR

configs/ls1012ardb.h +0 -1

index 1659fc5a76..89aa952dc6 100644
@@ -40,7 +40,6 @@
 #endif
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR

configs/ls1021aiot.h +0 -1

index cc76c4e5e8..4a63efc5ef 100644
@@ -127,7 +127,6 @@
 #define CONFIG_FSL_ESDHC
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #ifndef PCI_DEVICE_ID_FREESCALE_AHCI
 #define PCI_DEVICE_ID_FREESCALE_AHCI	0x0440

configs/ls1043aqds.h +0 -1

index a63e9f4981..a7f78f46ae 100644
@@ -94,7 +94,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 
 /* EEPROM */

configs/ls1043ardb.h +0 -1

index 9e71e8f430..34f82281c8 100644
@@ -286,7 +286,6 @@
 
 /* SATA */
 #ifndef SPL_NO_SATA
-#define CONFIG_LIBATA
 #ifndef CONFIG_CMD_EXT2
 #define CONFIG_CMD_EXT2
 #endif

configs/ls1046aqds.h +0 -1

index 74b1c1127b..f510f2457a 100644
@@ -137,7 +137,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 
 /* EEPROM */

configs/ls1046ardb.h +0 -1

index f143a9ea3f..6e64077673 100644
@@ -211,7 +211,6 @@
 
 /* SATA */
 #ifndef SPL_NO_SATA
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA				AHCI_BASE_ADDR

configs/ls1088a_common.h +0 -1

index 602c5745ca..bc6a52247c 100644
@@ -156,7 +156,6 @@ unsigned long long get_qixis_addr(void);
 
 /* SATA */
 #ifdef CONFIG_SCSI
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SATA1		AHCI_BASE_ADDR1

configs/ls2080aqds.h +0 -1

index 0a14cf48cf..815d8adc92 100644
@@ -46,7 +46,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_FSL_DDR_BIST	/* enable built-in memory test */
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1

configs/ls2080ardb.h +0 -1

index ab9c4ef8c3..6f3301c2fd 100644
@@ -64,7 +64,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_FSL_DDR_BIST	/* enable built-in memory test */
 
 /* SATA */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 
 #define CONFIG_SYS_SATA1			AHCI_BASE_ADDR1

configs/m53evk.h +0 -1

index c1634e53bf..50379c7b21 100644
@@ -145,7 +145,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /*

configs/mvebu_armada-37xx.h +0 -1

index 52d4944554..af16b9454a 100644
@@ -97,7 +97,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA

configs/mvebu_armada-8k.h +0 -1

index c2b2d12678..7f143164c3 100644
@@ -97,7 +97,6 @@
  * SATA/SCSI/AHCI configuration
  */
 #define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA

configs/mx53loco.h +0 -1

index 0c5e9831ae..323aa3d907 100644
@@ -186,7 +186,6 @@
 	#define CONFIG_DWC_AHSATA_PORT_ID       0
 	#define CONFIG_DWC_AHSATA_BASE_ADDR     SATA_BASE_ADDR
 	#define CONFIG_LBA48
-	#define CONFIG_LIBATA
 #endif
 
 /* Framebuffer and LCD */

configs/mx6cuboxi.h +0 -1

index 392f9529de..d649172d5f 100644
@@ -27,7 +27,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID       0
 #define CONFIG_DWC_AHSATA_BASE_ADDR     SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* Ethernet Configuration */

configs/nitrogen6x.h +0 -1

index faf21cb5ae..8e0d6df93d 100644
@@ -53,7 +53,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 #define CONFIG_FEC_MXC

configs/novena.h +0 -1

index 736ac931e4..f82b6a44d2 100644
@@ -112,7 +112,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* UART */

configs/omap5_uevm.h +0 -1

index 124657f61a..38a0055297 100644
@@ -61,7 +61,6 @@
 
 #define CONSOLEDEV		"ttyO2"
 
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	1
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/ot1200.h +0 -1

index 1146838f34..051416eab8 100644
@@ -63,7 +63,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* SPL */

configs/p1_p2_rdb_pc.h +0 -1

index 3f073d06cb..c64314c640 100644
@@ -245,7 +245,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 
 #if defined(CONFIG_TARGET_P2020RDB)

configs/p1_twr.h +0 -1

index 5edf07197f..d2302636ac 100644
@@ -51,7 +51,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 
 #ifndef __ASSEMBLY__

configs/qemu-arm.h +0 -1

index 69e886b43e..c8852cef34 100644
@@ -31,7 +31,6 @@
 
 /* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
-#define CONFIG_LIBATA
 
 /* Environment options */
 #define CONFIG_ENV_SIZE				SZ_64K

configs/sunxi-common.h +0 -1

index 5ffd69664c..26f889dd3e 100644
@@ -113,7 +113,6 @@
 #define PHYS_SDRAM_0_SIZE		0x80000000 /* 2 GiB */
 
 #ifdef CONFIG_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SUNXI_AHCI
 #define CONFIG_SYS_64BIT_LBA

configs/t4qds.h +0 -2

index 07060e6813..5a69708e30 100644
@@ -209,8 +209,6 @@
 
 /* SATA */
 #ifdef CONFIG_FSL_SATA_V2
-#define CONFIG_LIBATA
-
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
 #define CONFIG_SYS_SATA1		CONFIG_SYS_MPC85xx_SATA1_ADDR

configs/tbs2910.h +0 -1

index 281809d87a..3a3bab0fea 100644
@@ -82,7 +82,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* USB */

configs/theadorable.h +0 -1

index 774324f28b..6e95aa1626 100644
@@ -65,7 +65,6 @@
 
 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE	1
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 
 /* Additional FS support/configuration */

configs/turris_omnia.h +0 -1

index 7a7a157bbb..3dbd2cacba 100644
@@ -53,7 +53,6 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1

configs/udoo.h +0 -1

index f21ee521cc..989014a177 100644
@@ -29,7 +29,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 /* Network support */

configs/wandboard.h +0 -1

index 2155358561..e42bfc51f8 100644
@@ -30,7 +30,6 @@
 #define CONFIG_DWC_AHSATA_PORT_ID	0
 #define CONFIG_DWC_AHSATA_BASE_ADDR	SATA_ARB_BASE_ADDR
 #define CONFIG_LBA48
-#define CONFIG_LIBATA
 #endif
 
 #define CONFIG_SYS_MEMTEST_START	0x10000000

configs/x86-common.h +0 -1

index 5554df9484..064c546403 100644
@@ -29,7 +29,6 @@
 
 /* SATA AHCI storage */
 #ifdef CONFIG_SCSI_AHCI
-#define CONFIG_LIBATA
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA

configs/xilinx_zynqmp.h +0 -1

index 493e3e30d5..57fee6a4c8 100644
@@ -157,7 +157,6 @@
 #endif
 
 #ifdef CONFIG_SATA_CEVA
-#define CONFIG_LIBATA
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID	2
 #define CONFIG_SYS_SCSI_MAX_LUN		1
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \

config_whitelist.txt +0 -1

index 67feedfbf2..b65eb0936c 100644
@@ -1245,7 +1245,6 @@ CONFIG_LEGACY_BOOTCMD_ENV
 CONFIG_LG4573
 CONFIG_LG4573_BUS
 CONFIG_LG4573_CS
-CONFIG_LIBATA
 CONFIG_LIB_HW_RAND
 CONFIG_LIB_UUID
 CONFIG_LINUX

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:26 UTC #18 lore raw

PATCH 9/10 ata: Migrate CONFIG_LIBATA to Kconfig

Quoted 5 lines · Tuomas Tynkkynen

This symbol enables some library code used by various SATA drivers, so make this a non-user-visible symbol select'ed by the respective drivers, and let moveconfig handle the rest.
Signed-off-by Tuomas Tynkkynen <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/fd0440bc/attachment.sig>

Tuomas Tynkkynen

author

2017-12-08 13:36 UTC #19 lore raw

PATCH 10/10 ata: Migrate CONFIG_MVSATA_IDE to Kconfig

In reply to Tuomas Tynkkynen

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

---
 arch/arm/mach-kirkwood/include/mach/config.h | 1 -
 configs/d2net_v2_defconfig                   | 1 +
 configs/dns325_defconfig                     | 1 +
 configs/dreamplug_defconfig                  | 1 +
 configs/ds109_defconfig                      | 1 +
 configs/edminiv2_defconfig                   | 1 +
 configs/goflexhome_defconfig                 | 1 +
 configs/guruplug_defconfig                   | 1 +
 configs/ib62x0_defconfig                     | 1 +
 configs/inetspace_v2_defconfig               | 1 +
 configs/lschlv2_defconfig                    | 1 +
 configs/lsxhl_defconfig                      | 1 +
 configs/nas220_defconfig                     | 1 +
 configs/net2big_v2_defconfig                 | 1 +
 configs/netspace_lite_v2_defconfig           | 1 +
 configs/netspace_max_v2_defconfig            | 1 +
 configs/netspace_mini_v2_defconfig           | 1 +
 configs/netspace_v2_defconfig                | 1 +
 configs/nsa310s_defconfig                    | 1 +
 configs/openrd_base_defconfig                | 1 +
 configs/openrd_client_defconfig              | 1 +
 configs/openrd_ultimate_defconfig            | 1 +
 configs/sheevaplug_defconfig                 | 1 +
 drivers/ata/Kconfig                          | 6 ++++++
 include/configs/edminiv2.h                   | 1 -
 scripts/config_whitelist.txt                 | 1 -
 26 files changed, 28 insertions(+), 3 deletions(-)

arm/mach-kirkwood/include/mach/config.h +0 -1

index ba6007186e..efa4e7b6e2 100644
@@ -97,7 +97,6 @@
  */
 #ifdef CONFIG_IDE
 #define __io
-#define CONFIG_MVSATA_IDE
 #define CONFIG_IDE_PREINIT
 #define CONFIG_MVSATA_IDE_USE_PORT1
 /* Needs byte-swapping for ATA data register */

d2net_v2_defconfig +1 -0

index 496c5c02d4..61fd892005 100644
@@ -26,6 +26,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

dns325_defconfig +1 -0

index 62ad86ced4..f5556e30aa 100644
@@ -23,6 +23,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896k(u-boot),128k(u-boot-env),5m(ke
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y

dreamplug_defconfig +1 -0

index 1130faa392..9d24f9c16b 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

ds109_defconfig +1 -0

index 987a924b7e..6d513cf584 100644
@@ -14,6 +14,7 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y

edminiv2_defconfig +1 -0

index 14540ca371..4eafb6d5fa 100644
@@ -21,6 +21,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_EXT2=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y

goflexhome_defconfig +1 -0

index 80652fec79..bdfd62a576 100644
@@ -24,6 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)"
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y

guruplug_defconfig +1 -0

index d219fee508..66a668a7bb 100644
@@ -24,6 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:896K(uboot),128K(uboot_env),- at 1M(ro
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y

ib62x0_defconfig +1 -0

index fd7c148860..f6bfa06dcb 100644
@@ -22,6 +22,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000 at 0x0(uboot),0x20000 at 0xe0000(
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y

inetspace_v2_defconfig +1 -0

index bac0d95b76..d222c335fe 100644
@@ -26,6 +26,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

lschlv2_defconfig +1 -0

index 4df0a21298..077df1a5bf 100644
@@ -28,6 +28,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

lsxhl_defconfig +1 -0

index d6ba4be286..3627eb998b 100644
@@ -20,6 +20,7 @@ CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y

nas220_defconfig +1 -0

index 09bb8f1e93..8a71ed894e 100644
@@ -24,6 +24,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y

net2big_v2_defconfig +1 -0

index 3e3150042d..76b1f90354 100644
@@ -26,6 +26,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

netspace_lite_v2_defconfig +1 -0

index edd279ad6f..67cb4dd2e9 100644
@@ -26,6 +26,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

netspace_max_v2_defconfig +1 -0

index 2454c4f380..dc72128275 100644
@@ -26,6 +26,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

netspace_mini_v2_defconfig +1 -0

index 6f67c5db63..f2dec062e7 100644
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

netspace_v2_defconfig +1 -0

index cdcc09641e..c898150d9e 100644
@@ -26,6 +26,7 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y

nsa310s_defconfig +1 -0

index 425b53a0ad..5e111cb339 100644
@@ -21,6 +21,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000 at 0x0(uboot),0x20000 at 0xe0000(
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y

openrd_base_defconfig +1 -0

index 9bc628f168..1a829b763f 100644
@@ -24,6 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000 at 0x000000(uboot),0x400000 at 0x1
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y

openrd_client_defconfig +1 -0

index c74f0cf56f..7a95b5b54f 100644
@@ -24,6 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000 at 0x000000(uboot),0x400000 at 0x1
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y

openrd_ultimate_defconfig +1 -0

index 6792af84ef..757be16f53 100644
@@ -24,6 +24,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand_mtd:0x100000 at 0x000000(uboot),0x400000 at 0x1
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y

sheevaplug_defconfig +1 -0

index 6145077ebf..21704ec1ff 100644
@@ -25,6 +25,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:512K(uboot),512K(env),4M(kernel),-(
 CONFIG_CMD_UBI=y
 CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_MVSATA_IDE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y

ata/Kconfig +6 -0

index 43e6626969..990de72309 100644
@@ -72,6 +72,12 @@ config FSL_SATA
 	  Enable this driver to support the SATA controller found in
 	  some Freescale PowerPC SoCs.
 
+config MVSATA_IDE
+	bool "Enable Marvell SATA controller driver support via IDE interface"
+	help
+	  Enable this driver to support the SATA controller found in
+	  some Marvell SoCs, running in IDE compatibility mode using PIO.
+
 config SATA_MV
 	bool "Enable Marvell SATA controller driver support"
 	select LIBATA

configs/edminiv2.h +0 -1

index 17d23839b8..2b7a5d7c5c 100644
@@ -140,7 +140,6 @@
 #define __io
 #define CONFIG_IDE_PREINIT
 /* ED Mini V has an IDE-compatible SATA connector for port 1 */
-#define CONFIG_MVSATA_IDE
 #define CONFIG_MVSATA_IDE_USE_PORT1
 /* Needs byte-swapping for ATA data register */
 #define CONFIG_IDE_SWAP_IO

config_whitelist.txt +0 -1

index b65eb0936c..a533af5e61 100644
@@ -1457,7 +1457,6 @@ CONFIG_MVGBE
 CONFIG_MVGBE_PORTS
 CONFIG_MVMFP_V2
 CONFIG_MVS
-CONFIG_MVSATA_IDE
 CONFIG_MVSATA_IDE_USE_PORT0
 CONFIG_MVSATA_IDE_USE_PORT1
 CONFIG_MV_ETH_RXQ

Signature · 1 line

2.15.0

Tom Rini

2017-12-13 02:26 UTC #20 lore raw

PATCH 10/10 ata: Migrate CONFIG_MVSATA_IDE to Kconfig

Quoted 1 line · Tuomas Tynkkynen

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

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171212/700a9216/attachment.sig>