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

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

diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index cb737fc2da623da8fa59f78881e9732f6e13f2dd..715ed74eadec5dc7d7c8f98779135718be60b482 100644 (file)
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -30,12 +30,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * If we are developing, we might want to start U-Boot 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)
@@ -113,7 +107,7 @@
 
 #define CFG_MONITOR_LEN                0x20000         /* 128 KiB */
 
-                                                /* valid baudrates */
+                                               /* valid baudrates */
 #define CFG_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /*
@@ -227,12 +221,12 @@
 
 #define CFG_GAFR0_L_VAL     (_BIT22+_BIT24+_BIT31)
 #define CFG_GAFR0_U_VAL     (_BIT15+_BIT17+_BIT19+\
-                             _BIT20+_BIT22+_BIT24+_BIT26+_BIT29+_BIT31)
+                            _BIT20+_BIT22+_BIT24+_BIT26+_BIT29+_BIT31)
 #define CFG_GAFR1_L_VAL     (_BIT3+_BIT4+_BIT6+_BIT8+_BIT10+_BIT12+_BIT15+_BIT17+_BIT19+\
-                             _BIT20+_BIT23+_BIT24+_BIT27+_BIT28+_BIT31)
+                            _BIT20+_BIT23+_BIT24+_BIT27+_BIT28+_BIT31)
 #define CFG_GAFR1_U_VAL     (_BIT21+_BIT23+_BIT25+_BIT27+_BIT29+_BIT31)
 #define CFG_GAFR2_L_VAL     (_BIT1+_BIT3+_BIT5+_BIT7+_BIT9+_BIT11+_BIT13+_BIT15+_BIT17+\
-                             _BIT19+_BIT21+_BIT23+_BIT25+_BIT27+_BIT29+_BIT31)
+                            _BIT19+_BIT21+_BIT23+_BIT25+_BIT27+_BIT29+_BIT31)
 #define CFG_GAFR2_U_VAL     (_BIT1)
 
 #define CFG_PSSR_VAL        (0x20)
@@ -283,4 +277,3 @@
 #define CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
 
 #endif  /* __CONFIG_H */
-