dm: pci: Avoid a driver model build error with CONFIG_CMD_PCI_ENUM

This is not supported with driver model, so print a message instead of
generating a build error. Rescanning PCI is not yet implemented.

This function will be implemented later once some additional PCI driver
model improvements are merged. It was confirmed on the mailing list
that no one on the tegra side will miss this feature, so it is disabled
for tegra.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@nvidia.com>

diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index 802e4330440e21e6a27fe08acafc58a5876e571a..2eafd5cc98e14db24c221e5fb0c2b6eaceb2e3ec 100644 (file)
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -458,7 +458,11 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return pci_cfg_display(bdf, addr, size, value);
 #ifdef CONFIG_CMD_PCI_ENUM
        case 'e':
+# ifdef CONFIG_DM_PCI
+               printf("This command is not yet supported with driver model\n");
+# else
                pci_init();
+# endif
                return 0;
 #endif
        case 'n':               /* next */

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 7552a809db7da8e7b3676dce8fd2b3b51a38d92f..e1eb700404c8c055c38ea576c6ace43408234d1d 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -51,7 +51,6 @@
 #define CONFIG_PCI
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
 #define CONFIG_E1000_NO_NVM

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 6dff1b9d0e209e3a8e1f3bd62aaa34d10bb719a6..3bed9a4f0efd751198ecc73e14f31edee414155e 100644 (file)
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -73,7 +73,6 @@
 #define CONFIG_PCI
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
 #define CONFIG_RTL8169

diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 664e79b0634028769dc6dc22fa53439da50d2f05..c26a25cb228e2ac64fc7e55a0a441e273ba5806c 100644 (file)
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -75,7 +75,6 @@
 #define CONFIG_PCI
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
 #define CONFIG_RTL8169

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 6cb064a27d71ca994790e80d8839969b119605b2..23b2e436167c3a078f470c4c417c05b62fac49ab 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -60,7 +60,6 @@
 #define CONFIG_PCI
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
 #define CONFIG_RTL8169

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 46a801d9b6965a20344ba25b4f8e997cddfc45df..7dbf4221f437a380d8ba26cfb762b47c9115bb34 100644 (file)
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -56,7 +56,6 @@
 #define CONFIG_PCI
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
 #define CONFIG_RTL8169

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index c70fa08e7801ea2d8b2da5e27a5d84ffeff71b8a..8761f8de093309b30d75060a2c3f2345fadad587 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -58,7 +58,6 @@
 #define CONFIG_PCI
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
 #define CONFIG_RTL8169