From: Simon Glass <sjg@chromium.org>
Date: Fri, 20 Nov 2015 03:26:56 +0000 (-0700)
Subject: dm: pci: Avoid a driver model build error with CONFIG_CMD_PCI_ENUM
X-Git-Tag: v2016.01-rc2~92
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=871bc923740538959dff818f382cbcce0282fa52;p=oweals%2Fu-boot.git

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 802e433044..2eafd5cc98 100644
--- 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 7552a809db..e1eb700404 100644
--- 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 6dff1b9d0e..3bed9a4f0e 100644
--- 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 664e79b063..c26a25cb22 100644
--- 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 6cb064a27d..23b2e43616 100644
--- 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 46a801d9b6..7dbf4221f4 100644
--- 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 c70fa08e78..8761f8de09 100644
--- 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