Kconfig: Drop CONFIG_CMD_PCI_ENUM

This option enables the 'pci enum' command. It is only enabled by a few
board and these have not yet been converted to driver model, which always
enables this command. It seems easiest to just remove this option.

The affected boards can be converted to use driver model for PCI if
needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

diff --git a/cmd/pci.c b/cmd/pci.c
index fe27b4f761ad9310a00ceeb837a5b3f352a59fb6..b8c799f9bd886bc754935e9df7d87295affd8973 100644 (file)
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -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 d8dab8e46a4a61027131b43452e629be8bcd14b8..9ed6b9892cd4a1aca02119319c6eb080ec241208 100644 (file)
--- 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 f5998b4a52bd42a15b95fde7d2a958b6b686cc28..0b84acdee86d71b5352a62fca67916e161930fbd 100644 (file)
--- 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 27bed4b39d8af0533466354fdcd7244c1a9fb4ca..e38a8b70fa311871f3ad70dbfc61f2d66f04e35b 100644 (file)
--- 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 c1986ad88fa4fbc87a666d95693eabe3e92502fd..a23c3268844fb1bd72b101d024ad156abbcee894 100644 (file)
--- 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 7781bc996b8587ff4c9678f03e2fed3da0efc2c1..dd0aa07904aaf00c1e55052bafa5c4e91a197721 100644 (file)
--- 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 fa53355d0a5e9d39c400bc6a815083b6d646d2c3..16fa8007a1f85bb9dd71df5be8db0d3a2535812a 100644 (file)
--- 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 8c7147fade6795f40f5033e9cda46cf118cb8fc0..b2f50c0500614806fe8bff7dd5981aaed93bdd1c 100644 (file)
--- 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