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 <dbrown...@users.sourceforge.net>
Typo fix: use CONFIG_SOC_DM644X, not CONFIG_SOC_DM646.
Signed-off-by: David Brownell <dbrown...@users.sourceforge.net>
---
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;
/*------------------------------------------------------------------*
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
