summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-11-19 20:26:56 -0700
committerSimon Glass <sjg@chromium.org>2015-12-01 06:26:36 -0700
commit871bc923740538959dff818f382cbcce0282fa52 (patch)
treea3dfea2ed24b9d26b584353d8a2fdcfddd41c5ff /common
parentfde7e18938d84950979beccb4b2b279efb19c4bd (diff)
downloadu-boot-imx-871bc923740538959dff818f382cbcce0282fa52.zip
u-boot-imx-871bc923740538959dff818f382cbcce0282fa52.tar.gz
u-boot-imx-871bc923740538959dff818f382cbcce0282fa52.tar.bz2
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>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_pci.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index 802e433..2eafd5c 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 */