Merge with /home/m8/git/u-boot

[oweals/u-boot.git] / include / configs / omap2420h4.h

diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 5674e20fc8227005adf1a54dafb65b59087819fc..58374616a14afb52f060792504dbe1e0055c49c9 100644 (file)
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -40,7 +40,7 @@
 
 /* Clock config to target*/
 #define PRCM_CONFIG_II 1
-//#define PRCM_CONFIG_III              1
+/* #define PRCM_CONFIG_III             1 */
 
 #include <asm/arch/omap2420.h>        /* get chip and board defs */
 
@@ -132,6 +132,7 @@
 /*
  *  Board NAND Info.
  */
+#define CFG_NAND_LEGACY
 #define CFG_NAND_ADDR 0x04000000  /* physical address to access nand at CS0*/
 
 #define CFG_MAX_NAND_DEVICE 1  /* Max number of NAND devices */
@@ -157,7 +158,6 @@
 #define NAND_WP_OFF()  do {*(volatile u32 *)(0x6800A050) |= 0x00000010;} while(0)
 #define NAND_WP_ON()  do {*(volatile u32 *)(0x6800A050) &= ~0x00000010;} while(0)
 
-
 #define NAND_CTL_CLRALE(nandptr)
 #define NAND_CTL_SETALE(nandptr)
 #define NAND_CTL_CLRCLE(nandptr)
@@ -165,7 +165,6 @@
 #define NAND_DISABLE_CE(nand)
 #define NAND_ENABLE_CE(nand)
 
-
 #define CONFIG_BOOTDELAY         3
 
 #ifdef NFS_BOOT_DEFAULTS
@@ -261,9 +260,6 @@
 #define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
 #endif
 
-
-
-
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
  */