On Mon, Jun 30, 2014 at 06:09:53PM -0500, Scott Wood wrote:
On Tue, 2014-07-01 at 00:56 +0200, Wolfgang Denk wrote:
Dear Scott,
In message 1404159636.2435.165.ca...@snotra.buserror.net you wrote:
I agree that #ifdef's should be avoided, but then here they also serve
a
Dear Tom,
In message 20140707161204.GM29202@bill-the-cat you wrote:
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
On Mon, 2014-07-07 at 12:12 -0400, Tom Rini wrote:
On Mon, Jun 30, 2014 at 06:09:53PM -0500, Scott Wood wrote:
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
Hello Scott,
In message 20140701104510.83c0d383...@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
Dear Scott,
In message 1404169793.2435.204.ca...@snotra.buserror.net you wrote:
(git) diff needs a reference to diff against. Maybe I missed some
earlier comments about that, but how exactly should this be done
here?
When the code is synced, the corresponding Linux SHA1 or tag should be
On Thu, 2014-06-26 at 09:51 +0200, Wolfgang Denk wrote:
Dear Scott,
In message 1403637570.26908.38.ca...@snotra.buserror.net you wrote:
I still disagree with #ifndef __UBOOT__ as it will hurt more than it
helps with future merges.
I agree that #ifdef's should be avoided, but then here
Dear Scott,
In message 1404159636.2435.165.ca...@snotra.buserror.net you wrote:
I agree that #ifdef's should be avoided, but then here they also serve
a documentation purpose as they clearly mark areas of code that are
specific to U-Boot, or that are not used in U-Boot.
git diff can do
On Tue, 2014-07-01 at 00:56 +0200, Wolfgang Denk wrote:
Dear Scott,
In message 1404159636.2435.165.ca...@snotra.buserror.net you wrote:
I agree that #ifdef's should be avoided, but then here they also serve
a documentation purpose as they clearly mark areas of code that are
specific
Dear Scott,
In message 1403637570.26908.38.ca...@snotra.buserror.net you wrote:
I still disagree with #ifndef __UBOOT__ as it will hurt more than it
helps with future merges.
I agree that #ifdef's should be avoided, but then here they also serve
a documentation purpose as they clearly mark
On Tuesday, June 24, 2014 at 06:48:27 AM, Heiko Schocher wrote:
Hello Tom,
Am 23.06.2014 17:05, schrieb Tom Rini:
On Sun, Jun 22, 2014 at 09:36:43AM +0200, Wolfgang Denk wrote:
Dear Heiko,
In message53a67ed9.2090...@denx.de you wrote:
And I have no chance to detect this difference,
On Tue, Jun 24, 2014 at 08:58:46AM +0200, Marek Vasut wrote:
On Tuesday, June 24, 2014 at 06:48:27 AM, Heiko Schocher wrote:
Hello Tom,
Am 23.06.2014 17:05, schrieb Tom Rini:
On Sun, Jun 22, 2014 at 09:36:43AM +0200, Wolfgang Denk wrote:
Dear Heiko,
In
On Tue, Jun 24, 2014 at 06:48:27AM +0200, Heiko Schocher wrote:
Hello Tom,
Am 23.06.2014 17:05, schrieb Tom Rini:
On Sun, Jun 22, 2014 at 09:36:43AM +0200, Wolfgang Denk wrote:
Dear Heiko,
In message53a67ed9.2090...@denx.de you wrote:
And I have no chance to detect this difference,
On Sun, 2014-06-22 at 08:59 +0200, Heiko Schocher wrote:
Ok, did a git diff v3.7.1..v3.14 ... for drivers/mtd/nand and
drivers/mtd/mtd*.{c,h} and applied it with git am -3 ... after
fetching the Linux tree into my U-boot repository ... this
command worked now nice ... but there are subtle
Hello Tom,
Am 24.06.2014 16:39, schrieb Tom Rini:
On Tue, Jun 24, 2014 at 06:48:27AM +0200, Heiko Schocher wrote:
Hello Tom,
Am 23.06.2014 17:05, schrieb Tom Rini:
On Sun, Jun 22, 2014 at 09:36:43AM +0200, Wolfgang Denk wrote:
Dear Heiko,
In message53a67ed9.2090...@denx.de you wrote:
Hello Scott,
Am 24.06.2014 21:19, schrieb Scott Wood:
On Sun, 2014-06-22 at 08:59 +0200, Heiko Schocher wrote:
Ok, did a git diff v3.7.1..v3.14 ... for drivers/mtd/nand and
drivers/mtd/mtd*.{c,h} and applied it with git am -3 ... after
fetching the Linux tree into my U-boot repository ... this
On Sun, Jun 22, 2014 at 09:36:43AM +0200, Wolfgang Denk wrote:
Dear Heiko,
In message 53a67ed9.2090...@denx.de you wrote:
And I have no chance to detect this difference, when using
git am -3 ... ... it just remains in the code ...
I vote for copying the linux files, marking U-Boot
Hello Tom,
Am 23.06.2014 17:05, schrieb Tom Rini:
On Sun, Jun 22, 2014 at 09:36:43AM +0200, Wolfgang Denk wrote:
Dear Heiko,
In message53a67ed9.2090...@denx.de you wrote:
And I have no chance to detect this difference, when using
git am -3 ... ... it just remains in the code ...
I vote
Hello Scott,
Am 20.06.2014 09:59, schrieb Heiko Schocher:
Hello Scott,
Am 20.06.2014 01:45, schrieb Scott Wood:
On Thu, 2014-06-19 at 12:34 +0200, Heiko Schocher wrote:
Hello Tom, Scott,
Am 18.06.2014 23:42, schrieb Tom Rini:
[...]
I really fear a patch git format-patch -o ubifs-resync
Dear Heiko,
In message 53a67ed9.2090...@denx.de you wrote:
And I have no chance to detect this difference, when using
git am -3 ... ... it just remains in the code ...
I vote for copying the linux files, marking U-Boot specific code
with __UBOOT__ ...
Given the complexity of the code -
Hello Scott,
Am 20.06.2014 01:45, schrieb Scott Wood:
On Thu, 2014-06-19 at 12:34 +0200, Heiko Schocher wrote:
Hello Tom, Scott,
Am 18.06.2014 23:42, schrieb Tom Rini:
On Wed, Jun 18, 2014 at 04:24:39PM -0500, Scott Wood wrote:
On Wed, 2014-06-18 at 09:55 +0200, Heiko Schocher wrote:
Hello
Hello Tom, Scott,
Am 18.06.2014 23:42, schrieb Tom Rini:
On Wed, Jun 18, 2014 at 04:24:39PM -0500, Scott Wood wrote:
On Wed, 2014-06-18 at 09:55 +0200, Heiko Schocher wrote:
Hello Scott,
[snip]
history to see what Linux version corresponded to the last mtd sync, and
generate a diff relative
On Thu, 2014-06-19 at 12:34 +0200, Heiko Schocher wrote:
Hello Tom, Scott,
Am 18.06.2014 23:42, schrieb Tom Rini:
On Wed, Jun 18, 2014 at 04:24:39PM -0500, Scott Wood wrote:
On Wed, 2014-06-18 at 09:55 +0200, Heiko Schocher wrote:
Hello Scott,
[snip]
history to see what Linux version
Hello Scott,
Am 17.06.2014 17:54, schrieb Scott Wood:
On Tue, 2014-06-17 at 09:15 +0200, Heiko Schocher wrote:
- Following Code in drivers/mtd/nand/nand_base.c nand_do_write_ops()
adapted for U-Boot:
+#ifndef __UBOOT__
/* Reject writes, which are not page aligned */
if
On Wed, 2014-06-18 at 09:55 +0200, Heiko Schocher wrote:
Hello Scott,
Am 17.06.2014 17:54, schrieb Scott Wood:
On Tue, 2014-06-17 at 09:15 +0200, Heiko Schocher wrote:
- Following Code in drivers/mtd/nand/nand_base.c nand_do_write_ops()
adapted for U-Boot:
+#ifndef __UBOOT__
On Wed, Jun 18, 2014 at 04:24:39PM -0500, Scott Wood wrote:
On Wed, 2014-06-18 at 09:55 +0200, Heiko Schocher wrote:
Hello Scott,
[snip]
history to see what Linux version corresponded to the last mtd sync, and
generate a diff relative to that.
I think, we should have the linux code
resync mtd, ubi and ubifs subsystem with linux:
commit 455c6fdbd219161bd09b1165f11699d6d73de11c
Author: Linus Torvalds torvalds at linux-foundation.org
Date: Sun Mar 30 20:40:15 2014 -0700
Linux 3.14
Main reason for this sync is, we now have UBI fastmap support
in U-Boot.
Tested it on
On Tue, 2014-06-17 at 09:15 +0200, Heiko Schocher wrote:
- Following Code in drivers/mtd/nand/nand_base.c nand_do_write_ops()
adapted for U-Boot:
+#ifndef __UBOOT__
/* Reject writes, which are not page aligned */
if (NOTALIGNED(to) || NOTALIGNED(ops-len)) {
+else
+
27 matches
Mail list logo
