hi Ben, On Wed Nov 17, 2010 at 11:26:47AM -0500, Ben Gardiner wrote: > Hi Stefano, > > On Wed, Nov 17, 2010 at 5:09 AM, Stefano Babic <sba...@denx.de> wrote: > > [...] > > diff --git a/arch/arm/include/asm/arch-davinci/da8xx_common.h > > b/arch/arm/include/asm/arch-davinci/da8xx_common.h > > deleted file mode 100644 > > index 8b564f7..0000000 > > --- a/arch/arm/include/asm/arch-davinci/da8xx_common.h > > +++ /dev/null > > @@ -1,33 +0,0 @@ > > -void irq_init(void); > > -int da8xx_configure_lpsc_items(const struct lpsc_resource *item, > > - int n_items); > > -#if defined(CONFIG_DRIVER_TI_EMAC) && > > defined(CONFIG_MACH_DAVINCI_DA850_EVM) > > -void da850_emac_mii_mode_sel(int mode_sel); > > -#endif > > I don't know what is the best way to proceed... I like the current > state of this patch series. I was unable to apply the three patch > series (Sugosh's, Yours and mine) in any order without conflicts.
I think you would need to rebase your patch 'da850: Add RMII support for EMAC', on top of my patches. I had made changes in the include/asm/arch-davinci/hardware.h and moved the board/davinci/da8xxevm/common.h, both of which you are making changes to. Stefano's patch series should then apply on top of your rebased patch. Missed out your patch, else would have flagged you in advance. Sorry about that. -sughosh _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
