[U-Boot] [PATCH v2] Added nand bootupdate command for i.MX6 and similar systems

[Sergey Kubushyn]

On Fri, 7 Oct 2016, Fabio Estevam wrote:

> On Fri, Oct 7, 2016 at 10:36 PM, Sergey Kubushyn <ksi at koi8.net> wrote:
>
>> OK, it is done against the latest u-boot master as it is stated in that
>> manual on U-Boot patches. I don't know why it fails on u-boot-imx tree.
>> U-Boot master has been pulled 2 hours ago so it is the most recent one.
>
> If I try to apply against U-Boot master which has top of tree commit:
>
> commit 4dc34be4301e9f9ddca2d22a8ddb1161ee40f2d1
> Author: Simon Glass <sjg at chromium.org>
> Date:   Sun Oct 2 18:01:11 2016 -0600
>
>    README: Fix CONFIG_SYS_NAND_MAX_DEVICE typo
>
> $ patch -p1 --dry-run < nand.patch
> checking file arch/arm/include/asm/imx-common/mxs_nand.h
> checking file cmd/Kconfig
> Hunk #1 FAILED at 571.
> 1 out of 1 hunk FAILED
> checking file cmd/nand.c
> Hunk #1 FAILED at 38.
> Hunk #2 FAILED at 372.
> Hunk #3 FAILED at 777.
> Hunk #4 FAILED at 798.
> 4 out of 4 hunks FAILED
> checking file drivers/mtd/nand/Makefile
> Hunk #1 FAILED at 67.
> 1 out of 1 hunk FAILED
> checking file drivers/mtd/nand/mxs_nand.c
> Hunk #1 FAILED at 26.
> Hunk #2 FAILED at 150.
> Hunk #3 FAILED at 226.
> 3 out of 3 hunks FAILED
> checking file drivers/mtd/nand/mxs_nand_bootupdate.c

OK, I don't know why it is failing. It looks like some bug in my git
that generates that patch with format-patch command. I'm cloning master,
applying my changes, committing them, generating a patch. Then that
generated patch fails to apply to yet another fresh clone of the same
master with exactly the same errors you see.

Trying to find out what's wrong right now...

---
******************************************************************
*  KSI at home    KOI8 Net  < >  The impossible we do immediately.  *
*  Las Vegas   NV, USA   < >  Miracles require 24-hour notice.   *
******************************************************************