Merge with git://www.denx.de/git/u-boot.git

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

diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index cb737fc..2b2d377 100644 (file)
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -31,12 +31,6 @@
 #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)
  */
@@ -60,10 +54,26 @@
 #define CONFIG_BAUDRATE                19200
 #undef CONFIG_MISC_INIT_R              /* FIXME: misc_init_r() missing     */
 
-#define CONFIG_COMMANDS (CFG_CMD_FLASH|CFG_CMD_MEMORY|CFG_CMD_ENV|CFG_CMD_RUN|CFG_CMD_ASKENV|CFG_CMD_ECHO)
-/* CONFIG_CMD_DFL|CFG_CMD_I2C|CFG_CMD_EEPROM|CFG_CMD_NET|CFG_CMD_JFFS2|CFG_CMD_DHCP) */
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any)   */
-#include <cmd_confdefs.h>
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_ECHO
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_RUN
+
 
 #define CONFIG_BOOTDELAY       3
 /* #define CONFIG_BOOTARGS     "root=/dev/nfs ip=bootp console=ttyS0,19200" */
@@ -113,7 +123,7 @@
 
 #define CFG_MONITOR_LEN                0x20000         /* 128 KiB */
 
-                                                /* valid baudrates */
+                                               /* valid baudrates */
 #define CFG_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /*
@@ -227,12 +237,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 +293,3 @@
 #define CFG_ENV_SIZE            0x4000  /* Total Size of Environment Sector     */
 
 #endif  /* __CONFIG_H */
-