[U-Boot] [PATCH v4 2/8] dm: pci: Avoid a driver model build error with CONFIG_CMD_PCI_ENUM

Simon Glass
2015-11-14T04:19:35Z

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

Changes in v4:
- Drop CONFIG_CMD_PCI_ENUM for p2371-2180 also

Changes in v3: None
Changes in v2:
- Update commit message to explain that the feature is not important
- Drop the feature from tegra boards

common/cmd_pci.c | 4 ++++
include/configs/apalis_t30.h | 1 -
include/configs/beaver.h | 1 -
include/configs/cardhu.h | 1 -
include/configs/jetson-tk1.h | 1 -
include/configs/p2371-2180.h | 1 -
include/configs/trimslice.h | 1 -
7 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index dcecef8..69c5332 100644
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -457,7 +457,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 7552a80..e1eb700 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 9e8dcf3f7..a2c9622 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.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/cardhu.h b/include/configs/cardhu.h
index 174bb48..0d857bb 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -77,7 +77,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 08cf563..5da360f 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -61,7 +61,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 56b169f..6194c7e 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -57,7 +57,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 bdf1bd4..add5d40 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.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
--
2.6.0.rc2.230.g3dd15c0