ppc4xx: Add initial esd PMC440 board files
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
This patch adds the first files for the new esd PMC440 boards. The next two patches will complete the PMC440 board support.
---
board/{amcc/sequoia => esd/pmc440}/Makefile | 4 +-
board/{amcc/sequoia => esd/pmc440}/config.mk | 0
board/{amcc/sequoia => esd/pmc440}/init.S | 64 +--
.../sequoia/sequoia.c => esd/pmc440/pmc440.c} | 564 +++++++++++++++-----
board/esd/pmc440/pmc440.h | 154 ++++++
board/{amcc/sequoia => esd/pmc440}/sdram.c | 0
board/{amcc/sequoia => esd/pmc440}/sdram.h | 0
board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds | 0
board/{amcc/sequoia => esd/pmc440}/u-boot.lds | 0
9 files changed, 595 insertions(+), 191 deletions(-)
copy board/{amcc/sequoia => esd/pmc440}/Makefile (95%)
copy board/{amcc/sequoia => esd/pmc440}/config.mk (100%)
copy board/{amcc/sequoia => esd/pmc440}/init.S (71%)
copy board/{amcc/sequoia/sequoia.c => esd/pmc440/pmc440.c} (57%)
create mode 100644 board/esd/pmc440/pmc440.h
copy board/{amcc/sequoia => esd/pmc440}/sdram.c (100%)
copy board/{amcc/sequoia => esd/pmc440}/sdram.h (100%)
copy board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds (100%)
copy board/{amcc/sequoia => esd/pmc440}/u-boot.lds (100%)board/esd/pmc440/Makefile renamed from board/amcc/sequoia/Makefile +3 -1
@@ -25,7 +25,9 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS = $(BOARD).o cmd_sequoia.o sdram.o +COBJS = $(BOARD).o cmd_pmc440.o sdram.o fpga.o \ + ../common/cmd_loadpci.o + SOBJS = init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/esd/pmc440/config.mk renamed from board/amcc/sequoia/config.mk +0 -0
board/esd/pmc440/init.S renamed from board/amcc/sequoia/init.S +11 -53
92 lines not on this page · raw message
board/esd/pmc440/pmc440.c renamed from board/amcc/sequoia/sequoia.c +427 -137
767 lines not on this page · raw message
board/esd/pmc440/pmc440.h new file +154 -0
154 lines not on this page · raw message
board/esd/pmc440/sdram.c renamed from board/amcc/sequoia/sdram.c +0 -0
board/esd/pmc440/sdram.h renamed from board/amcc/sequoia/sdram.h +0 -0
board/esd/pmc440/u-boot-nand.lds renamed from board/amcc/sequoia/u-boot-nand.lds +0 -0
board/esd/pmc440/u-boot.lds renamed from board/amcc/sequoia/u-boot.lds +0 -0
Signature · 1 line
1.5.3
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
Hi Matthias,
Quoted 17 lines · Matthias Fuchs
This patch adds the first files for the new esd PMC440 boards. The next two patches will complete the PMC440 board support.
Signed-off-by Matthias Fuchs <[email protected]>--- board/{amcc/sequoia => esd/pmc440}/Makefile | 4 +- board/{amcc/sequoia => esd/pmc440}/config.mk | 0 board/{amcc/sequoia => esd/pmc440}/init.S | 64 +-- .../sequoia/sequoia.c => esd/pmc440/pmc440.c} | 564 +++++++++++++++----- board/esd/pmc440/pmc440.h | 154 ++++++ board/{amcc/sequoia => esd/pmc440}/sdram.c | 0 board/{amcc/sequoia => esd/pmc440}/sdram.h | 0 board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds | 0 board/{amcc/sequoia => esd/pmc440}/u-boot.lds | 0 9 files changed, 595 insertions(+), 191 deletions(-) copy board/{amcc/sequoia => esd/pmc440}/Makefile (95%)
Quoted 8 lines
copy board/{amcc/sequoia => esd/pmc440}/config.mk (100%)
copy board/{amcc/sequoia => esd/pmc440}/init.S (71%)
copy board/{amcc/sequoia/sequoia.c => esd/pmc440/pmc440.c} (57%)
create mode 100644 board/esd/pmc440/pmc440.h
copy board/{amcc/sequoia => esd/pmc440}/sdram.c (100%)
copy board/{amcc/sequoia => esd/pmc440}/sdram.h (100%)
copy board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds (100%)
copy board/{amcc/sequoia => esd/pmc440}/u-boot.lds (100%)This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference (sequoia) has changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
So Matthias, could you please resend these 3 patches without this option to me directly?
Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
Hi Stefan,
the '--find-copies-harder' option would be more usefull when the patch would contain a reference to commit id it is based on. So let's say a stable U-Boot relase tag.
Smaller patches are not everyting that counts in my opinion. diff'ing against an existing file does not really help in understanding what Matthias is doing in his code.
Even x-mas wishing time is over, we still have a chance for a new year present - Let's say a 100k size limit in 2008.
(Won't duck)
Matthias
Quoted 50 lines · Stefan Roese
Hi Matthias,
Quoted 17 lines · Matthias Fuchs
This patch adds the first files for the new esd PMC440 boards. The next two patches will complete the PMC440 board support.
Signed-off-by Matthias Fuchs <[email protected]>--- board/{amcc/sequoia => esd/pmc440}/Makefile | 4 +- board/{amcc/sequoia => esd/pmc440}/config.mk | 0 board/{amcc/sequoia => esd/pmc440}/init.S | 64 +-- .../sequoia/sequoia.c => esd/pmc440/pmc440.c} | 564 +++++++++++++++----- board/esd/pmc440/pmc440.h | 154 ++++++ board/{amcc/sequoia => esd/pmc440}/sdram.c | 0 board/{amcc/sequoia => esd/pmc440}/sdram.h | 0 board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds | 0 board/{amcc/sequoia => esd/pmc440}/u-boot.lds | 0 9 files changed, 595 insertions(+), 191 deletions(-) copy board/{amcc/sequoia => esd/pmc440}/Makefile (95%)Quoted 8 lines
copy board/{amcc/sequoia => esd/pmc440}/config.mk (100%) copy board/{amcc/sequoia => esd/pmc440}/init.S (71%) copy board/{amcc/sequoia/sequoia.c => esd/pmc440/pmc440.c} (57%) create mode 100644 board/esd/pmc440/pmc440.h copy board/{amcc/sequoia => esd/pmc440}/sdram.c (100%) copy board/{amcc/sequoia => esd/pmc440}/sdram.h (100%) copy board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds (100%) copy board/{amcc/sequoia => esd/pmc440}/u-boot.lds (100%)This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference (sequoia) has changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
So Matthias, could you please resend these 3 patches without this option to me directly?
Thanks.
Best regards,
Stefan=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
Signature · 5 lines
----------------------------------------------------------------------- Dipl.-Ing. Matthias Fuchs esd electronic system design gmbh http://www.esd-electronics.com Vahrenwalder Str. 207 phone: +49-511-37298-0, fax: -68 30165 Hannover, Germany -----------------------------------------------------------------------
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
In reply to Stefan RoeseHi Stefan,
Quoted 29 lines
Hi Matthias,
Quoted 17 lines · Matthias Fuchs
This patch adds the first files for the new esd PMC440 boards. The next two patches will complete the PMC440 board support.
Signed-off-by Matthias Fuchs <[email protected]>--- board/{amcc/sequoia => esd/pmc440}/Makefile | 4 +- board/{amcc/sequoia => esd/pmc440}/config.mk | 0 board/{amcc/sequoia => esd/pmc440}/init.S | 64 +-- .../sequoia/sequoia.c => esd/pmc440/pmc440.c} | 564 +++++++++++++++----- board/esd/pmc440/pmc440.h | 154 ++++++ board/{amcc/sequoia => esd/pmc440}/sdram.c | 0 board/{amcc/sequoia => esd/pmc440}/sdram.h | 0 board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds | 0 board/{amcc/sequoia => esd/pmc440}/u-boot.lds | 0 9 files changed, 595 insertions(+), 191 deletions(-) copy board/{amcc/sequoia => esd/pmc440}/Makefile (95%)Quoted 8 lines
copy board/{amcc/sequoia => esd/pmc440}/config.mk (100%) copy board/{amcc/sequoia => esd/pmc440}/init.S (71%) copy board/{amcc/sequoia/sequoia.c => esd/pmc440/pmc440.c} (57%) create mode 100644 board/esd/pmc440/pmc440.h copy board/{amcc/sequoia => esd/pmc440}/sdram.c (100%) copy board/{amcc/sequoia => esd/pmc440}/sdram.h (100%) copy board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds (100%) copy board/{amcc/sequoia => esd/pmc440}/u-boot.lds (100%)
Quoted 8 lines
This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference (sequoia) has changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
So Matthias, could you please resend these 3 patches without this option to me directly?
This failure mode of git is so annoying, effectively rendering the nice patch format useless, that we researched a little bit deeper.
Am I correct to assume that you tried to apply the patch with "plain" git-am only, i.e. without using -3?
Because by now I am pretty much convinced that you should have been able to successfully use it with a "git-am -3" as this invokation really tries to do a merge of the recorded identities of the relevant blobs instead of "only applying diffs".
For the git savvy among the readers on a lower level this uses "--build-fake-ancestor" from git-apply although this option does not lend itself to easy usage from a command line.
Cheers
Detlev
Signature · 8 lines
It was actually a very beautiful thing to see a sunrise, cause' that's
such a calm time of day. It's a wonderful time of day to get ready to
go to bed.
-- Richard M. Stallman
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.dePATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
Hi Detlev,
Quoted 6 lines · Detlev Zundel
Quoted 6 lines
This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference (sequoia) has changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
Quoted 8 lines
Quoted 2 lines
So Matthias, could you please resend these 3 patches without this option to me directly?
This failure mode of git is so annoying, effectively rendering the nice patch format useless, that we researched a little bit deeper.
Am I correct to assume that you tried to apply the patch with "plain" git-am only, i.e. without using -3?
IIRC, I didn't even try to apply this version of the patch. I tried to review it and failed because the patch was "unreadable" for me.
Quoted 8 lines
Because by now I am pretty much convinced that you should have been able to successfully use it with a "git-am -3" as this invokation really tries to do a merge of the recorded identities of the relevant blobs instead of "only applying diffs".
For the git savvy among the readers on a lower level this uses "--build-fake-ancestor" from git-apply although this option does not lend itself to easy usage from a command line.
I don't remember any problems applying those kind of patches. And I'm pretty sure that I didn't use the "-3" option.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
Hi Stefan,
Quoted 2 lines
IIRC, I didn't even try to apply this version of the patch. I tried to review it and failed because the patch was "unreadable" for me.
Hm, then I am not sure what you meant by this passage from your mail:
Quoted 3 lines
Quoted 3 lines
This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference (sequoia) has
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Quoted 8 lines
Quoted 5 lines
changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
So Matthias, could you please resend these 3 patches without this option to me directly?
I don't remember any problems applying those kind of patches. And I'm pretty sure that I didn't use the "-3" option.
Regardless of previous experiences, just remember to give "git-am -3" a try once git-am without it fails.
Cheers
Detlev
Signature · 7 lines
I shall be telling this with a sigh / Somewhere ages and ages hence: / Two roads diverged in a wood, and I-- / I took the one less traveled by, / And that has made all the difference. -- Robert Frost -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
Hi Detlev,
Quoted 9 lines · Detlev Zundel
Quoted 2 lines
IIRC, I didn't even try to apply this version of the patch. I tried to review it and failed because the patch was "unreadable" for me.
Hm, then I am not sure what you meant by this passage from your mail:
Quoted 3 lines
Quoted 3 lines
This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference (sequoia) has
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Ahh. You are right of course. The origin (Sequoia) changed and therefor the patch didn't apply anymore.
Quoted 11 lines
Quoted 8 lines
Quoted 5 lines
changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
So Matthias, could you please resend these 3 patches without this option to me directly?
I don't remember any problems applying those kind of patches. And I'm pretty sure that I didn't use the "-3" option.
Regardless of previous experiences, just remember to give "git-am -3" a try once git-am without it fails.
Ok. But I hope not to see such patches anymore since they are not reviewable. At least not for me.
Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
In reply to Detlev ZundelQuoted 3 lines · In message <[email protected]> you wrote:
Regardless of previous experiences, just remember to give "git-am -3" a try once git-am without it fails.
Actually I think you should *always* use
git-am -3 -i -u --whitespace=strip
[OK, the "-u" is default today, but who knows which version of git you are using. And "-i" is IMHO just a good idea.]
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Sorry, but my karma just ran over your dogma.
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
In reply to Detlev ZundelQuoted 36 lines · Detlev Zundel
Hi Stefan,
Quoted 34 lines
Hi Matthias,
Quoted 17 lines · Matthias Fuchs
This patch adds the first files for the new esd PMC440 boards. The next two patches will complete the PMC440 board support.
Signed-off-by Matthias Fuchs <[email protected]>--- board/{amcc/sequoia => esd/pmc440}/Makefile | 4 +- board/{amcc/sequoia => esd/pmc440}/config.mk | 0 board/{amcc/sequoia => esd/pmc440}/init.S | 64 +-- .../sequoia/sequoia.c => esd/pmc440/pmc440.c} | 564 +++++++++++++++----- board/esd/pmc440/pmc440.h | 154 ++++++ board/{amcc/sequoia => esd/pmc440}/sdram.c | 0 board/{amcc/sequoia => esd/pmc440}/sdram.h | 0 board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds | 0 board/{amcc/sequoia => esd/pmc440}/u-boot.lds | 0 9 files changed, 595 insertions(+), 191 deletions(-) copy board/{amcc/sequoia => esd/pmc440}/Makefile (95%)Quoted 8 lines
copy board/{amcc/sequoia => esd/pmc440}/config.mk (100%) copy board/{amcc/sequoia => esd/pmc440}/init.S (71%) copy board/{amcc/sequoia/sequoia.c => esd/pmc440/pmc440.c} (57%) create mode 100644 board/esd/pmc440/pmc440.h copy board/{amcc/sequoia => esd/pmc440}/sdram.c (100%) copy board/{amcc/sequoia => esd/pmc440}/sdram.h (100%) copy board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds (100%) copy board/{amcc/sequoia => esd/pmc440}/u-boot.lds (100%)This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference (sequoia) has changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
Quoted 5 lines
Quoted 2 lines
So Matthias, could you please resend these 3 patches without this option to me directly?
This failure mode of git is so annoying, effectively rendering the nice patch format useless, that we researched a little bit deeper.
Which failure mode? I missed the description of a failure anywhere in this discussion. Is there a repeatable bug setup that duplicates this failure?
Are you just referring to it not finding copies in patches by default? And that in this case someone used them to make the patch smaller? I mean, if it says 100% copy, then it is a literal move, and if it is fractional, the relevant diffs should be present in the patch still anyway.
Quoted 7 lines
Am I correct to assume that you tried to apply the patch with "plain" git-am only, i.e. without using -3?
Because by now I am pretty much convinced that you should have been able to successfully use it with a "git-am -3" as this invokation really tries to do a merge of the recorded identities of the relevant blobs instead of "only applying diffs".
Right. As long as the SHA1 in the patch are present in the repository to which the patch is being applied, it will attempt to revert to a 3-way merge based on that ancestor.
Quoted 3 lines
For the git savvy among the readers on a lower level this uses "--build-fake-ancestor" from git-apply although this option does not lend itself to easy usage from a command line.
Uh, "-3" on a "git am" command is pretty easy, isn't it? :-)
Which might be a subtle way of saying that I missed your point, perhaps?
jdl
PATCH RESEND 1/3 ppc4xx: Add initial esd PMC440 board files
Hi Jon,
Quoted 3 lines
Which failure mode? I missed the description of a failure anywhere in this discussion. Is there a repeatable bug setup that duplicates this failure?
Yes indeed, it seems you missed the description, although I clearly cited it now multiple times:
Quoted 3 lines
Quoted 3 lines
This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Quoted 8 lines
Quoted 2 lines
(sequoia) has changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
Are you just referring to it not finding copies in patches by default? And that in this case someone used them to make the patch smaller? I mean, if it says 100% copy, then
it is a literal move, and if it is fractional, the relevant diffs should be present in the patch still anyway.
No, I was talking about a diff based on the "copy and change" variant not working anymore after the origin of the copy is changed _in the repository where git-apply is attempted_.
Quoted 3 lines
Right. As long as the SHA1 in the patch are present in the repository to which the patch is being applied, it will attempt to revert to a 3-way merge based on that ancestor.
Exactly, this was my original point. I obviously failed to make it clear that git-apply or git-am alone will fail under the above conditions.
Quoted 5 lines
Quoted 3 lines
For the git savvy among the readers on a lower level this uses "--build-fake-ancestor" from git-apply although this option does not lend itself to easy usage from a command line.
Uh, "-3" on a "git am" command is pretty easy, isn't it? :-)
Did I say anything different? It was just an interesting piece of information that I discovered in the process that I didn't want to keep for myself.
Quoted 2 lines
Which might be a subtle way of saying that I missed your point, perhaps?
So it seems.
Cheers
Detlev
Signature · 7 lines
I just found out that the brain is like a computer. If that's true, then there really aren't any stupid people. Just people running Windows. -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de