On Mon, Dec 22, 2008 at 6:08 PM, Peter Tyser ptyser@xes-inc.com wrote:
Hi Andy,
On Mon, 2008-12-22 at 13:36 -0600, Andy Fleming wrote:
are available in the git repository at:
git://www.denx.de/git/u-boot-mpc85xx.git master
<snip>
Peter Tyser (5): pci/fsl_pci_init: Enable inbound PCI config cycles Add support for PCA953x I2C gpio devices XPedite5370 board support 85xx: Enable inbound PCI config cycles for X-ES boards XPedite5200 board support
Thanks for picking up these patches. It looks like something got a bit messed up in the process however.
- The order of application of "85xx: Enable inbound PCI config cycles
for X-ES boards" and "XPedite5200 board support" should be swapped - the "85xx: Enable inbound PCI config cycles for X-ES boards" patch modifies some code that "XPedite5200 board support" added. I'm fine with submitting another patch to resolve any issues if that's easier for you.
- The "XPedite5200 board support" patch in the 85xx branch only appears
to change files which exist, it doesn't add a number of necessary, new files. eg diff stat from the patch: MAINTAINERS | 1 + MAKEALL | 1 + Makefile | 3 + board/xes/common/Makefile | 3 +- board/xes/common/actl_nand.c | 65 ++++ board/xes/common/fsl_85xx_pci.c | 103 +++++++- board/xes/xpedite5200/Makefile | 55 ++++ board/xes/xpedite5200/config.mk | 34 +++ board/xes/xpedite5200/ddr.c | 91 ++++++ board/xes/xpedite5200/law.c | 51 ++++ board/xes/xpedite5200/tlb.c | 85 ++++++ board/xes/xpedite5200/u-boot.lds | 145 +++++++++ board/xes/xpedite5200/xpedite5200.c | 125 ++++++++ include/configs/XPEDITE5200.h | 546 +++++++++++++++++++++++++++++++++++ 14 files changed, 1303 insertions(+), 5 deletions(-) create mode 100644 board/xes/common/actl_nand.c create mode 100644 board/xes/xpedite5200/Makefile create mode 100644 board/xes/xpedite5200/config.mk create mode 100644 board/xes/xpedite5200/ddr.c create mode 100644 board/xes/xpedite5200/law.c create mode 100644 board/xes/xpedite5200/tlb.c create mode 100644 board/xes/xpedite5200/u-boot.lds create mode 100644 board/xes/xpedite5200/xpedite5200.c
vs modified files from what's in 85xx branch: MAINTAINERS MAKEALL Makefile board/xes/common/Makefile board/xes/common/fsl_85xx_pci.c
Let me know if I should take any action.
Ugh, yeah, if you could submit patches which fix this, I'd appreciate it. I had some difficulty getting the patches to apply in the right order (mailbox issues), and must have lost some things in the merge.
Andy