From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Wed, 5 Sep 2012 07:17:51 -0700 Subject: [U-Boot] How to manage RMOBILE patches? In-Reply-To: <20120905131839.066977f2@lilith> References: <20120903191556.3467D203EDC@gemini.denx.de> <20120904173610.GB23991@bill-the-cat> <20120905131839.066977f2@lilith> Message-ID: <50475F0F.8060404@ti.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 09/05/2012 04:18 AM, Albert ARIBAUD wrote: > Hi Nobuhiro, > > On Wed, 5 Sep 2012 11:26:37 +0900, Nobuhiro Iwamatsu > wrote: > >> Hi, >> >> On Wed, Sep 5, 2012 at 2:36 AM, Tom Rini wrote: >>> On Mon, Sep 03, 2012 at 09:15:56PM +0200, Wolfgang Denk wrote: >>>> Dear Nobuhiro Iwamatsu, >>>> >>>> In message >>>> >>>> you wrote: >>>>> >>>>> I am working supporting Renesas RMOBILE to U-Boot. >>>>> Renesas's RMOBILE SoC family contains an ARM Cortex-A9, and this >>>>> uses the same IP as SH. >>>>> (For example, timer, ether, serial, etc.) >>>>> I already sent to patches of rmobile, I got review from some >>>>> developers. And the patch is managed by the arm/rmobile branch >>>>> of u-boot-sh[0] which I have maintained, now. >>>>> Since I had you take the patch of rmobile into an ARM >>>>> repository, I consulted with Albert about the >>>>> future development approach. >>>>> >>>>> We thought two methods are considered. >>>>> One is Albert picks up a patch from ML to ARM repository, >>>> >>>> As this is ARM code, this appears the most natural approach to me >>>> >>>>> Another is whether to have pull from the repository by having a >>>>> repository for rmobile made. >>>> >>>> If this is an ARM SoC, then it should go through the ARM repo - >>>> even if we should later decide that there is so much traffic that a >>>> separate rmobile repo would be sustified, thi would still be a >>>> sub-repo, which Albert would pull from. >>> >>> Another option, which Mike is using for, iirc, sf and blackfin, is >>> just to add rmobile-master / rmobile-next as branches to the >>> u-boot-sh repository. >> >> Yes, this is one of easy way. But Albert won't pull form u-boot-sh, >> if If my understanding is not wrong. > > This just means that they'll end up on u-boot/master from u-boot.sh (and > from there into u-boot-arm later on). To be clear, what I'm saying is just add a few more branches to u-boot-sh that Albert will pull (since they're ARM stuff). Say u-boot-sh/rmobile/master and u-boot-sh/rmobile/next. Then not get too hung up on which repository a merge message comes from. :) -- Tom