From: Sughosh Ganu <urwithsughosh@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2][NEXT] Davinci 8xx: Move common functions to share code
Date: Thu, 18 Nov 2010 10:56:17 +0530 [thread overview]
Message-ID: <20101118052617.GA25317@Hardy> (raw)
In-Reply-To: <AANLkTindJoHYDsQ1pVK6oz5u9dQgzS7uFxscRjura3J6@mail.gmail.com>
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 <sbabic@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
next prev parent reply other threads:[~2010-11-18 5:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-17 10:09 [U-Boot] Davinci: add support for ea20 board Stefano Babic
2010-11-17 10:09 ` [U-Boot] [PATCH 1/2][NEXT] Davinci 8xx: Move common functions to share code Stefano Babic
2010-11-17 16:26 ` Ben Gardiner
2010-11-17 16:47 ` Stefano Babic
2010-11-18 21:50 ` Ben Gardiner
2010-11-19 6:06 ` Stefano Babic
2010-11-19 7:23 ` Sughosh Ganu
2010-11-23 16:55 ` sughosh ganu
2010-11-23 18:05 ` Stefano Babic
2010-11-23 18:25 ` Paulraj, Sandeep
2010-11-23 18:31 ` Ben Gardiner
2010-11-23 18:38 ` Paulraj, Sandeep
2010-11-23 18:44 ` Ben Gardiner
2010-11-23 18:44 ` Paulraj, Sandeep
2010-11-23 18:53 ` Ben Gardiner
2010-11-23 18:57 ` Paulraj, Sandeep
2010-11-23 18:59 ` Ben Gardiner
2010-11-24 5:47 ` Sughosh Ganu
2010-11-18 5:26 ` Sughosh Ganu [this message]
2010-11-18 13:32 ` Ben Gardiner
2010-11-19 14:35 ` [U-Boot] [PATCH V2 1/2] " Stefano Babic
2010-11-19 15:16 ` Ben Gardiner
2010-11-22 7:28 ` Stefano Babic
2010-11-22 14:33 ` Ben Gardiner
2010-11-22 15:52 ` Paulraj, Sandeep
2010-11-24 7:23 ` Sughosh Ganu
2010-11-24 16:27 ` Ben Gardiner
2010-11-19 14:35 ` [U-Boot] [PATCH V2 2/2] Davinci: add support for the ea20 board Stefano Babic
2010-11-17 10:09 ` [U-Boot] [PATCH V6 2/2][NEXT] " Stefano Babic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101118052617.GA25317@Hardy \
--to=urwithsughosh@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox