Message ID | 20170804223506.105306-12-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 186424248d2a435cca0d8999c2fadc93fb1eb0fe |
Delegated to: | Tom Rini |
Headers | show |
> 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> > --- > > Changes in v2: None > > cmd/pci.c | 4 ++-- > include/config_distro_bootcmd.h | 2 +- > include/configs/ds414.h | 1 - > include/configs/xpedite517x.h | 1 - > include/configs/xpedite520x.h | 1 - > include/configs/xpedite537x.h | 1 - > include/configs/xpedite550x.h | 1 - > scripts/config_whitelist.txt | 1 - > 8 files changed, 3 insertions(+), 9 deletions(-) > Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
On Fri, Aug 04, 2017 at 04:34:35PM -0600, Simon Glass wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/cmd/pci.c b/cmd/pci.c index fe27b4f761..b8c799f9bd 100644 --- 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 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 58325f2ec8..57fc16812e 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,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 2bf12120b3..628de82767 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,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 2a345d4ac6..c599b22bc8 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,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 0a09ded4d1..c387d951c1 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.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/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea59f44733..9819f02985 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,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