From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Brownell Date: Mon, 13 Jul 2009 16:29:04 -0700 Subject: [U-Boot] Pull request: nand flash In-Reply-To: <20090707230448.GA31160@b07421-ec1.am.freescale.net> References: <20090707230448.GA31160@b07421-ec1.am.freescale.net> Message-ID: <200907131629.04351.david-b@pacbell.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tuesday 07 July 2009, Scott Wood wrote: > I fixed the obvious merge conflict (missing #endif) in "davinci_nand: > cleanup I (minor)", but I'm a little confused since the symbol it refers > to (CONFIG_SOC_DM6446) doesn't seem to be defined anywhere. ?At first I > thought it had been replaced with CONFIG_SOC_DM644X, but that doesn't > seem to be the case -- AFAICT, there never was a definition of > CONFIG_SOC_DM6446 in the tree. ?There is one other place in the tree > that ifdefs based on it, though (cpu/arm926ejs/davinci/cpu.c). > > David, any thoughts? ?If this is in error, could you send a followup > patch? That should have been CONFIG_SOC_DM644X in the first place, yes. ========== CUT HERE From: David Brownell Typo fix: use CONFIG_SOC_DM644X, not CONFIG_SOC_DM646. Signed-off-by: David Brownell --- drivers/mtd/nand/davinci_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -182,7 +182,7 @@ static void nand_flash_init(void) * knowledge of the clocks and what devices are hooked up ... and * don't even do that unless no UBL handled it. */ -#ifdef CONFIG_SOC_DM6446 +#ifdef CONFIG_SOC_DM644X u_int32_t acfg1 = 0x3ffffffc; /*------------------------------------------------------------------*