Skip to contentSkip to conversation

ata: ahci-pci: Fix dependency on DM_PCI

PATCH In review Pali Rohár 3 participants 6 messages Aug 15, 2021 – Sep 2, 2021 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ata: ahci-pci: Fix dependency on DM_PCI

File drivers/ata/ahci-pci.c calls function ahci_probe_scsi_pci() which is compiled only when DM_PCI is enabled. So add missing dependency into Kconfig.

---
 drivers/ata/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/ata/Kconfig +1 -0
index 6f0b77238364..0c1490a9f900 100644
@@ -36,6 +36,7 @@ menu "SATA/SCSI device support"
 
 config AHCI_PCI
 	bool "Support for PCI-based AHCI controller"
+	depends on DM_PCI
 	depends on DM_SCSI
 	help
 	  Enables support for the PCI-based AHCI controller.
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 ata: ahci-pci: Add new option CONFIG_SPL_AHCI_PCI

This new option allows to disable ahci-pci driver in SPL. Disabling it is needed when SPL_PCI is not enabled as ahci-pci depends on PCI.

This change fixes following compile error when CONFIG_SPL_SATA_SUPPORT is enabled and SPL_PCI is disabled.

LD spl/u-boot-spl
arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.o: in function `ahci_probe_scsi_pci':
drivers/ata/ahci.c:1205: undefined reference to dm_pci_map_bar' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1215: undefined reference to dm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1216: undefined reference to dm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1220: undefined reference to dm_pci_map_bar' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1
make: *** [Makefile:1977: spl/u-boot-spl] Error 2

LD spl/u-boot-spl
arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci-pci.o: in function `ahci_pci_probe':
drivers/ata/ahci-pci.c:21: undefined reference to `ahci_probe_scsi_pci' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1
make: *** [Makefile:1977: spl/u-boot-spl] Error 2

---
 drivers/ata/Kconfig  | 6 ++++++
 drivers/ata/Makefile | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/ata/Kconfig +6 -0
index 0c1490a9f900..96c7c30375bd 100644
@@ -41,6 +41,12 @@ config AHCI_PCI
 	help
 	  Enables support for the PCI-based AHCI controller.
 
+config SPL_AHCI_PCI
+	bool "Support for PCI-based AHCI controller for SPL"
+	depends on SPL
+	depends on SPL_PCI
+	depends on SPL_SATA_SUPPORT && DM_SCSI
+
 config SATA_CEVA
 	bool "Ceva Sata controller"
 	depends on AHCI
drivers/ata/Makefile +1 -1
index 4811b2f82c4e..cd88131dcd13 100644
@@ -5,7 +5,7 @@
 
 obj-$(CONFIG_DWC_AHCI) += dwc_ahci.o
 obj-$(CONFIG_AHCI) += ahci-uclass.o
-obj-$(CONFIG_AHCI_PCI) += ahci-pci.o
+obj-$(CONFIG_$(SPL_)AHCI_PCI) += ahci-pci.o
 obj-$(CONFIG_SCSI_AHCI) += ahci.o
 obj-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o
 obj-$(CONFIG_FSL_SATA) += fsl_sata.o
Signature · 1 line
2.20.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] ata: ahci-pci: Add new option CONFIG_SPL_AHCI_PCI

Quoted 15 lines · Pali Rohár

This new option allows to disable ahci-pci driver in SPL. Disabling it is needed when SPL_PCI is not enabled as ahci-pci depends on PCI.

This change fixes following compile error when CONFIG_SPL_SATA_SUPPORT is enabled and SPL_PCI is disabled.

LD spl/u-boot-spl
arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.o: in function `ahci_probe_scsi_pci':
drivers/ata/ahci.c:1205: undefined reference to dm_pci_map_bar' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1215: undefined reference to dm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1216: undefined reference to dm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1220: undefined reference to dm_pci_map_bar' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1
make: *** [Makefile:1977: spl/u-boot-spl] Error 2

Quoted 7 lines

LD spl/u-boot-spl
arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci-pci.o: in function `ahci_pci_probe':

   drivers/ata/ahci-pci.c:21: undefined reference to `ahci_probe_scsi_pci'
   make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1
   make: *** [Makefile:1977: spl/u-boot-spl] Error 2

Thanks,
Stefan

Quoted 28 lines
---
  drivers/ata/Kconfig  | 6 ++++++
  drivers/ata/Makefile | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
drivers/ata/Kconfig +6 -0
index 0c1490a9f900..96c7c30375bd 100644
@@ -41,6 +41,12 @@ config AHCI_PCI
  	help
  	  Enables support for the PCI-based AHCI controller.
 
+config SPL_AHCI_PCI
+	bool "Support for PCI-based AHCI controller for SPL"
+	depends on SPL
+	depends on SPL_PCI
+	depends on SPL_SATA_SUPPORT && DM_SCSI
+
  config SATA_CEVA
  	bool "Ceva Sata controller"
  	depends on AHCI
drivers/ata/Makefile +0 -0
index 4811b2f82c4e..cd88131dcd13 100644

drivers/ata/Makefile line 11

Quoted 8 lines
drivers/ata/Makefile +1 -1
@@ -5,7 +5,7 @@
 
  obj-$(CONFIG_DWC_AHCI) += dwc_ahci.o
  obj-$(CONFIG_AHCI) += ahci-uclass.o
-obj-$(CONFIG_AHCI_PCI) += ahci-pci.o
+obj-$(CONFIG_$(SPL_)AHCI_PCI) += ahci-pci.o
  obj-$(CONFIG_SCSI_AHCI) += ahci.o
  obj-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o
  obj-$(CONFIG_FSL_SATA) += fsl_sata.o

Viele Grüße,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#3 lore raw

Re: [PATCH 2/2] ata: ahci-pci: Add new option CONFIG_SPL_AHCI_PCI

In reply to Pali Rohár
Quoted 15 lines · Pali Rohár

This new option allows to disable ahci-pci driver in SPL. Disabling it is needed when SPL_PCI is not enabled as ahci-pci depends on PCI.

This change fixes following compile error when CONFIG_SPL_SATA_SUPPORT is enabled and SPL_PCI is disabled.

LD spl/u-boot-spl
arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.o: in function `ahci_probe_scsi_pci':
drivers/ata/ahci.c:1205: undefined reference to dm_pci_map_bar' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1215: undefined reference to dm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1216: undefined reference to dm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1220: undefined reference to dm_pci_map_bar' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1
make: *** [Makefile:1977: spl/u-boot-spl] Error 2

Quoted 8 lines

LD spl/u-boot-spl
arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci-pci.o: in function `ahci_pci_probe':
drivers/ata/ahci-pci.c:21: undefined reference to `ahci_probe_scsi_pci' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1
make: *** [Makefile:1977: spl/u-boot-spl] Error 2

Applied to u-boot/next, thanks!

Signature · 1 line
Tom
Reviewed-by on v1 1/2
#4 lore raw
In reply to Pali Rohár
Quoted 5 lines · Pali Rohár

File drivers/ata/ahci-pci.c calls function ahci_probe_scsi_pci() which is compiled only when DM_PCI is enabled. So add missing dependency into Kconfig.

Thanks,
Stefan

Quoted 10 lines
---
  drivers/ata/Kconfig | 1 +
  1 file changed, 1 insertion(+)
drivers/ata/Kconfig +0 -0
index 6f0b77238364..0c1490a9f900 100644

drivers/ata/Kconfig menu "SATA/SCSI device support" · line 42

Quoted 7 lines
drivers/ata/Kconfig +1 -0
@@ -36,6 +36,7 @@ menu "SATA/SCSI device support"
 
  config AHCI_PCI
  	bool "Support for PCI-based AHCI controller"
+	depends on DM_PCI
  	depends on DM_SCSI
  	help
  	  Enables support for the PCI-based AHCI controller.

Viele Grüße,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]