Socrates: config file cleanup.

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

diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index b320a4050dfeb6aac407fa81236e77dfd463fb14..047b4a4f71a4b32e669b8d1390e5aba0debcf701 100644 (file)
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -30,17 +30,11 @@
 #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
-
 /*
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_PXA250          1       /* This is an PXA250 CPU            */
+#define CONFIG_PXA250          1       /* This is an PXA250 CPU            */
 #define CONFIG_GEALOG          1       /* on a Logotronic GEALOG SG board  */
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff      */
@@ -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" */