From 2cdb7f50ac59594540fffdf8dbd7b12beac79c52 Mon Sep 17 00:00:00 2001 From: Wolfgang Grandegger Date: Mon, 2 Jun 2008 15:09:55 +0200 Subject: [PATCH 1/2] MPC8360ERDK: adapt NAND interface for the re-written FSL NAND UPM driver Signed-off-by: Wolfgang Grandegger Acked-by: Anton Vorontsov Signed-off-by: Scott Wood --- board/freescale/mpc8360erdk/nand.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/board/freescale/mpc8360erdk/nand.c b/board/freescale/mpc8360erdk/nand.c index e1e790b34f..8b44a0f38c 100644 --- a/board/freescale/mpc8360erdk/nand.c +++ b/board/freescale/mpc8360erdk/nand.c @@ -39,6 +39,24 @@ static const u32 upm_array[] = { 0xfffffc00, 0xfffffc00, 0xfffffc00, 0xfffffc01, /* Words 60 to 63 */ }; +static void upm_setup(struct fsl_upm *upm) +{ + int i; + + /* write upm array */ + out_be32(upm->mxmr, MxMR_OP_WARR); + + for (i = 0; i < 64; i++) { + out_be32(upm->mdr, upm_array[i]); + out_8(upm->io_addr, 0x0); + } + + /* normal operation */ + out_be32(upm->mxmr, MxMR_OP_NORM); + while (in_be32(upm->mxmr) != MxMR_OP_NORM) + eieio(); +} + static int dev_ready(void) { if (in_be32(&im->qepio.ioport[4].pdat) & 0x00002000) { @@ -52,10 +70,9 @@ static int dev_ready(void) static struct fsl_upm_nand fun = { .upm = { - .array = upm_array, .io_addr = (void *)CFG_NAND_BASE, }, - .width = 1, + .width = 8, .upm_cmd_offset = 8, .upm_addr_offset = 16, .dev_ready = dev_ready, @@ -68,5 +85,8 @@ int board_nand_init(struct nand_chip *nand) fun.upm.mxmr = &im->lbus.mamr; fun.upm.mdr = &im->lbus.mdr; fun.upm.mar = &im->lbus.mar; + + upm_setup(&fun.upm); + return fsl_upm_nand_init(nand, &fun); } From 9e4006bca3d9fb4a2d061996771036cb01e539d3 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 16 Jun 2008 08:58:07 -0400 Subject: [PATCH 2/2] NAND: Add missing declaration to non-redundant saveenv(). Signed-off-by: Scott Wood --- common/env_nand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/env_nand.c b/common/env_nand.c index a48e98e509..e21d2a34ae 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -230,7 +230,8 @@ int saveenv(void) { size_t total; int ret = 0; - + nand_erase_options_t nand_erase_options; + nand_erase_options.length = CFG_ENV_RANGE; nand_erase_options.quiet = 0; nand_erase_options.jffs2 = 0;