diff options
| -rw-r--r-- | common/cmd_pci.c | 4 | ||||
| -rw-r--r-- | include/configs/apalis_t30.h | 1 | ||||
| -rw-r--r-- | include/configs/beaver.h | 1 | ||||
| -rw-r--r-- | include/configs/cardhu.h | 1 | ||||
| -rw-r--r-- | include/configs/jetson-tk1.h | 1 | ||||
| -rw-r--r-- | include/configs/p2371-2180.h | 1 | ||||
| -rw-r--r-- | 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 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 */ 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 6dff1b9..3bed9a4 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 664e79b..c26a25c 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 6cb064a..23b2e43 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 46a801d..7dbf422 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 c70fa08..8761f8d 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 |