[U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode fixup to Fman driver code

Scott Wood oss at buserror.net
Mon Feb 8 20:25:10 CET 2016


On Mon, 2016-02-08 at 19:22 +0000, york sun wrote:
> On 02/08/2016 11:18 AM, Scott Wood wrote:
> > On Mon, 2016-02-08 at 19:03 +0000, york sun wrote:
> > > On 02/01/2016 09:06 AM, york sun wrote:
> > > > On 01/25/2016 09:40 PM, Qianyu Gong wrote:
> > > > > 
> > > > > > -----Original Message-----
> > > > > > From: Scott Wood [mailto:oss at buserror.net]
> > > > > > Sent: Tuesday, January 26, 2016 1:17 AM
> > > > > > To: Qianyu Gong <qianyu.gong at nxp.com>; u-boot at lists.denx.de
> > > > > > Cc: B07421 at freescale.com; Shaohui Xie <shaohui.xie at nxp.com>
> > > > > > Subject: Re: [U-Boot] [Patch V3 2/3] fm: fdt: Move fman ucode
> > > > > > fixup to
> > > > > > Fman
> > > > > > driver code
> > > > > > 
> > > > > > On Mon, 2016-01-25 at 19:37 +0800, Gong Qianyu wrote:
> > > > > > > Both Freescale Layerscape and powerpc/mpc85xx platforms are
> > > > > > > using
> > > > > > > fdt_fixup_fman_firmware() to insert Fman ucode blob into the
> > > > > > > device
> > > > > > > tree. So move the function to driver code.
> > > > > > > 
> > > > > > > Signed-off-by: Gong Qianyu <Qianyu.Gong at nxp.com>
> > > > > > > ---
> > > > > > > V3:
> > > > > > >  - Remove file changes about "qe.h".
> > > > > > >    (Should be put in the first patch of this patchset)
> > > > > > > V2:
> > > > > > >  - New patch.
> > > > > > > 
> > > > > > >  arch/powerpc/cpu/mpc85xx/fdt.c | 125
> > > > > > > ++------------------------------------
> > > > > > > -
> > > > > > >  drivers/net/fm/Makefile        |   1 +
> > > > > > >  drivers/net/fm/fdt.c           | 129
> > > > > > > +++++++++++++++++++++++++++++++++++++++++
> > > > > > >  include/fsl_fman.h             |   1 +
> > > > > > >  4 files changed, 136 insertions(+), 120 deletions(-)
> > > > > > 
> > > > > > Again, pass -M -C to git format-patch.
> > > > > > 
> > > > > > -Scott
> > > > > 
> > > > > I don't understand but I've already used "git format-patch -M -C -
> > > > > -stat
> > > > > ...".
> > > > > 
> > > > 
> > > > Scott means using -M and -C, git should detect the moving instead of
> > > > adding and
> > > > deleting the same code. Try to add --find-copies-harder to see if it
> > > > generates a
> > > > smaller patch.
> > > > 
> > > 
> > > Qianyu,
> > > 
> > > Since you are on holiday, I tried it for you. Adjusting "-M -C" doesn't
> > > work.
> > > Even you are moving the function from one file to another, "git format
> > > -patch"
> > > cannot detect the moving because both files exist before and after this
> > > change,
> > > and the change set is not significant enough to be detected.
> > 
> > It looks like the patch is creating drivers/net/fm/fdt.c...
> > 
> 
> I was fooled and tried to adjust -M with numbers. I only noticed when I
> compared
> these two files before and after this patch.
> 
> Even it is moving a chunk of code from file A to file B, git cannot generate
> a
> patch saying so.

It can show it as a copy with the portions not copied deleted, though maybe
not enough was copied in this case.

-Scott



More information about the U-Boot mailing list