Hello Scott,
In message 20140701104510.83C0D3833A6@gemini.denx.de I wrote: ...
When the code is synced, the corresponding Linux SHA1 or tag should be placed in the commit message. This is the case for the NAND code. Unfortunately it has never been true of the mtd/ubi code, but this do-over in those trees is an opportunity to fix that.
Heiko already did that.
There is no intermediate step.
The unmodified source is in the Linux tree -- most likely in a more accurate/complete form than the ifdefs convey, since minor differences and subsequent local changes are unlikely to be marked.
You can either fetch the Linux tree into your local U-Boot repo (or vice versa) so that git diff can compare them, or you can check out separate repositories to the proper tags/SHAs and use ordinary diff. It's not something that I'd expect one to want to do very often, though. Usually
Are you talking here about the theoretitical possibility to do that, or have you actually done that - and found the result useful? Maybe I'm doing something wrong, but I get such a huge volume of new resp. deleted files that I find it really, really hard to see any diffs at all.
etc.
Do you have any further comments on that, i. e. do you really insist that the code be changes as you proposed?
I've tried that, but the result was worse than the current state. If you really want to get rid of the #ifdef's we should do this as a separate commit in Heiko's u-boot-testing branch, but otherwise I would really like to leave Heiko's code and approach as is, because it appears (to me) to be the easiest to reproduce and verify.
If you know better methods, then please show how these can be applied to this patch set in question here.
Thanks.
Best regards,
Wolfgang Denk