Merge with /home/sr/git/u-boot/cfi-flash

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

diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index f7338034b74725f3791f935eb200a2369fbd4ccd..a6c23712b5db83af3a636d30748170ae2d01f8ee 100644 (file)
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -30,12 +30,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)
@@ -208,8 +202,8 @@
 #define CFG_MDCNFG_VAL         0x00000aC9 /* Memory timings for the SDRAM.
                                              tRP=2, CL=2, tRCD=2, tRAS=5, tRC=8 */
 
-#define CFG_MDREFR_VAL         0x00403018 /* Initial setting, individual
-                                             bits set in memsetup.S      */
+#define CFG_MDREFR_VAL         0x00403018 /* Initial setting, individual       */
+                                          /* bits set in lowlevel_init.S       */
 #define CFG_MDMRS_VAL          0x00000000
 
 /*