diff options
-rw-r--r-- | cmd/pci.c | 4 | ||||
-rw-r--r-- | include/config_distro_bootcmd.h | 2 | ||||
-rw-r--r-- | include/configs/ds414.h | 1 | ||||
-rw-r--r-- | include/configs/xpedite517x.h | 1 | ||||
-rw-r--r-- | include/configs/xpedite520x.h | 1 | ||||
-rw-r--r-- | include/configs/xpedite537x.h | 1 | ||||
-rw-r--r-- | include/configs/xpedite550x.h | 1 | ||||
-rw-r--r-- | scripts/config_whitelist.txt | 1 |
8 files changed, 3 insertions, 9 deletions
@@ -694,7 +694,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if ((bdf = get_pci_dev(argv[2])) == -1) return 1; break; -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) case 'e': pci_init(); return 0; @@ -782,7 +782,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static char pci_help_text[] = "[bus] [long]\n" " - short or long list of PCI devices on bus 'bus'\n" -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) "pci enum\n" " - Enumerate PCI buses\n" #endif diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d8dab8e46a..9ed6b9892c 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -198,7 +198,7 @@ BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE #endif -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) #define BOOTENV_RUN_NET_PCI_ENUM "run boot_net_pci_enum; " #define BOOTENV_SHARED_PCI \ "boot_net_pci_enum=pci enum\0" diff --git a/include/configs/ds414.h b/include/configs/ds414.h index f5998b4a52..0b84acdee8 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -48,7 +48,6 @@ /* PCIe support */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_PCI_ENUM #define CONFIG_PCI_MVEBU #define CONFIG_PCI_SCAN_SHOW #endif diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 27bed4b39d..e38a8b70fa 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -483,7 +483,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index c1986ad88f..a23c326884 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -286,7 +286,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 7781bc996b..dd0aa07904 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index fa53355d0a..16fa8007a1 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -335,7 +335,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8c7147fade..b2f50c0500 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -293,7 +293,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_PCI_ENUM CONFIG_CMD_PCMCIA CONFIG_CMD_PORTIO CONFIG_CMD_READ |