Merge the new NAND code (testing-NAND brach); see doc/README.nand

[platform/kernel/u-boot.git] / include / configs / omap1610inn.h

diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index cbf828c..f28ede0 100644 (file)
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -27,12 +27,6 @@
 #define __CONFIG_H
 
 /*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL            /* undef for developing */
-
-/*
  * High Level Configuration Options
  * (easy to change)
  */
@@ -40,6 +34,7 @@
 #define CONFIG_OMAP    1                       /* in a TI OMAP core    */
 #define CONFIG_OMAP1610        1               /* which is in a 1610  */
 #define CONFIG_INNOVATOROMAP1610       1       /*  a Innovator Board  */
+#define CONFIG_MACH_OMAP_INNOVATOR     /* Select board mach-type */
 
 /* input clock of PLL */
 /* the OMAP1610 Innovator has 12MHz input clock */
@@ -155,7 +150,7 @@
 #define PHYS_FLASH_1_BM0       0x0C000000      /* Flash Bank #1 if booting from RAM */
 
 #ifdef CONFIG_CS_AUTOBOOT                      /* Determine CS assignment in runtime */
-                               
+
 #ifndef __ASSEMBLY__
 extern unsigned long omap_flash_base;          /* set in flash__init */
 #endif