From 871bc923740538959dff818f382cbcce0282fa52 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 19 Nov 2015 20:26:56 -0700 Subject: 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 Tested-by: Stephen Warren --- common/cmd_pci.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'common') diff --git a/common/cmd_pci.c b/common/cmd_pci.c index 802e4330440..2eafd5cc98e 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 */ -- cgit v1.3.1