ata: ahci-pci: Fix dependency on DM_PCI
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
@@ -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
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
@@ -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
@@ -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
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_PCIis not enabled as ahci-pci depends on PCI.This change fixes following compile error when
CONFIG_SPL_SATA_SUPPORTis enabled andSPL_PCIis 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 todm_pci_map_bar' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1215: undefined reference todm_pci_read_config16' arm-linux-gnueabihf-ld.bfd:drivers/ata/ahci.c:1216: undefined reference todm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1220: undefined reference todm_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 2Signed-off-by Pali Rohár <[email protected]>
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@@ -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 AHCIdrivers/ata/Makefile +0
-0
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]
Re: [PATCH 2/2] ata: ahci-pci: Add new option CONFIG_SPL_AHCI_PCI
In reply to Pali RohárQuoted 15 lines · Pali Rohár
This new option allows to disable ahci-pci driver in SPL. Disabling it is needed when
SPL_PCIis not enabled as ahci-pci depends on PCI.This change fixes following compile error when
CONFIG_SPL_SATA_SUPPORTis enabled andSPL_PCIis 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 todm_pci_map_bar' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1215: undefined reference todm_pci_read_config16' arm-linux-gnueabihf-ld.bfd:drivers/ata/ahci.c:1216: undefined reference todm_pci_read_config16' arm-linux-gnueabihf-ld.bfd: drivers/ata/ahci.c:1220: undefined reference todm_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 2Signed-off-by Pali Rohár <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
Quoted 5 lines · Pali Rohár
File
drivers/ata/ahci-pci.ccalls functionahci_probe_scsi_pci()which is compiled only whenDM_PCIis enabled. So add missing dependency intoKconfig.Signed-off-by Pali Rohár <[email protected]>
Thanks,
Stefan
Quoted 10 lines
--- drivers/ata/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/ata/Kconfig +0
-0
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]
Quoted 6 lines · Pali Rohár
File
drivers/ata/ahci-pci.ccalls functionahci_probe_scsi_pci()which is compiled only whenDM_PCIis enabled. So add missing dependency intoKconfig.Signed-off-by Pali Rohár <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom