[U-Boot] [PATCH 04/17] pci: Add ability to re-enumerate PCI buses

Wolfgang Denk
2010-10-20T19:57:25Z

Dear Peter Tyser,

In message <1285787156-6005-4-git-send-email-ptyser@xes-inc.com> you wrote:
> From: John Schmoller <jschmoller@xes-inc.com>
>
> Add a new 'pci enum' command which re-enumerates the PCI buses. This
> command is enabled via the CONFIG_CMD_PCI_ENUM define and can be useful
> in boards with FPGAs connected via PCI/PCIe, boards that support PCI
> hot-plugging, or during PCI debug.
>
> Also enable the 'pci enum' command for X-ES's Freescale-based boards.
>
> Signed-off-by: John Schmoller <jschmoller@xes-inc.com>
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> ---
> common/cmd_pci.c | 13 +++++++++++++
> drivers/pci/fsl_pci_init.c | 3 +++
> drivers/pci/pci.c | 4 +++-
> include/configs/XPEDITE5170.h | 1 +
> include/configs/XPEDITE5200.h | 1 +
> include/configs/XPEDITE5370.h | 1 +
> include/configs/XPEDITE5500.h | 1 +
> 7 files changed, 23 insertions(+), 1 deletions(-)

Acked-by: Wolfgang Denk <wd@denx.de>

Peter, I tried to apply, but I cannot:

Applying: pci: Add ability to re-enumerate PCI buses
fatal: sha1 information is lacking or useless (include/configs/XPEDITE5170.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 pci: Add ability to re-enumerate PCI buses

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"I can call spirits from the vasty deep."
"Why so can I, or so can any man; but will they come when you do call
for them?" - Shakespeare, 1 King Henry IV, Act III, Scene I.