Merge with /git/u-boot.git

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

diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index 8594e65822b4a1b7634a59d4a701ed198dbe03ea..9ac2856f65317e1c48de73fc9ad730fb5c348f1d 100644 (file)
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -31,8 +31,8 @@
  * 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 */
-#undef CONFIG_INIT_CRITICAL            /* undef for developing */
+#define CONFIG_SKIP_LOWLEVEL_INIT      1
+#undef  CONFIG_SKIP_RELOCATE_UBOOT
 
 /*
  * High Level Configuration Options
@@ -47,6 +47,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers