[U-Boot] [POWERPC] mgcoge: Second Flash on CS5 not on CS1

[U-Boot] [POWERPC] mgcoge: Second Flash on CS5 not on CS1

[Heiko Schocher]

Signed-off-by: Heiko Schocher <hs@denx.de>
---
 board/keymile/mgcoge/mgcoge.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c
index 099e77b..5931f17 100644
--- a/board/keymile/mgcoge/mgcoge.c
+++ b/board/keymile/mgcoge/mgcoge.c
@@ -334,7 +334,7 @@ void ft_blob_update (void *blob, bd_t *bd)
 	/* update Flash addr, size */
 	flash_data[2] = cpu_to_be32 (CFG_FLASH_BASE);
 	flash_data[3] = cpu_to_be32 (CFG_FLASH_SIZE);
-	flash_data[4] = cpu_to_be32 (1);
+	flash_data[4] = cpu_to_be32 (5);
 	flash_data[5] = cpu_to_be32 (0);
 	flash_data[6] = cpu_to_be32 (CFG_FLASH_BASE_1);
 	flash_data[7] = cpu_to_be32 (CFG_FLASH_SIZE_1);
-- 
1.5.6.1

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [POWERPC] mgcoge: Second Flash on CS5 not on CS1

[Wolfgang Denk]

Dear Heiko,

In message <48F77ACD.9030807@denx.de> you wrote:
> 
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
>  board/keymile/mgcoge/mgcoge.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Sorry, this patch does not apply:

Applying mgcoge: Second Flash on CS5 not on CS1
error: patch failed: board/keymile/mgcoge/mgcoge.c:334
error: board/keymile/mgcoge/mgcoge.c: patch does not apply
fatal: sha1 information is lacking or useless
(board/keymile/mgcoge/mgcoge.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.


Please fix and resubmit.

Best regards,

Wolfgang Denk

-- 
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
"Out of register space (ugh)"
- vi