[U-Boot] [PATCH-OMAP3 v2] OMAP3: Fix gpmc_cs_base pointer math in NAND

[Jean-Christophe PLAGNIOL-VILLARD]

On 20:58 Mon 10 Nov     , dirk.behme at googlemail.com wrote:
> gpmc_cs_base is an uint32_t pointer, correct pointer math. Missed after
> readl/writel conversion.
> 
> Signed-off-by: Dirk Behme <dirk.behme at gmail.com>
> 
> ---
> 
> Changes in v2:
> 
> - Correct patch header style.
> 
> v2 of this patch makes previous version v1 obsolete.
> 
> Jean-Christophe: Would be nice if you could handle this patch with priority
> as it prevents BeagleBoard from starting. Thanks!
> 
>  drivers/mtd/nand/omap_gpmc.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 

I've try to apply it but

OMAP3: Fix error in gpmc_init

Fix error in gpmc_init() introduced with readl/writel conversion. Use base
addresses + offset, not offset only. Minor clean up by removing unused code.

Signed-off-by: Dirk Behme <dirk.behme at gmail.com>
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying OMAP3: Fix error in gpmc_init
error: patch failed: cpu/arm_cortexa8/omap3/mem.c:233
error: cpu/arm_cortexa8/omap3/mem.c: patch does not apply
fatal: sha1 information is lacking or useless (cpu/arm_cortexa8/omap3/mem.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0003.
When you have resolved this problem run "git-am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git-am -i -3 --skip".

could you rebase it and specify the patch apply order via [PATCH X/X]

Best Regards,
J.