Merge branch 'mpc86xx'

[u-boot] / include / configs / omap1610h2.h

diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index b2b0fe721bcb2a01dc74752844b3759dc61f7c2d..c6ca689a5fe04aee8960e834b43d843c719a3a90 100644 (file)
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -26,12 +26,6 @@
 #ifndef __CONFIG_H
 #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_H2_OMAP1610     1       /* on an H2 Board */
+#define CONFIG_MACH_OMAP_H2            /* Select board mach-type */
 
 /* input clock of PLL */
 /* the OMAP1610 H2 has 12MHz input clock */
@@ -51,6 +46,7 @@
 
 #define CONFIG_CMDLINE_TAG     1       /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS       1
+#define CONFIG_INITRD_TAG              1
 
 /*
  * Size of malloc() pool
@@ -93,8 +89,7 @@
 #include <configs/omap1510.h>
 
 #define CONFIG_BOOTDELAY       3
-#define CONFIG_BOOTARGS        "mem=32M console=ttyS0,115200n8 noinitrd \
-                               root=/dev/nfs ip=dhcp"
+#define CONFIG_BOOTARGS        "console=ttyS0,115200n8 noinitrd root=/dev/nfs ip=dhcp"
 #define CONFIG_BOOTCOMMAND      "bootp;tftp;bootm"
 #define CFG_AUTOLOAD            "n"             /* No autoload */
 
@@ -150,7 +145,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