Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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

diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index 3cb9ebc454cf413b148a95c1b54aa9dcb0d5e34b..2b65052671e361e37afd934ac7516d6487cfffeb 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -34,7 +34,7 @@
  * 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_INNOKOM         1       /* on an Auerswald Innokom board    */
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff      */
@@ -54,10 +54,34 @@
 #define CONFIG_BAUDRATE                19200
 #define CONFIG_MISC_INIT_R     1       /* we have a misc_init_r() function */
 
-#define CONFIG_COMMANDS (CFG_CMD_BDI|CFG_CMD_LOADB|CFG_CMD_IMI|CFG_CMD_FLASH|CFG_CMD_MEMORY|CFG_CMD_NET|CFG_CMD_ENV|CFG_CMD_RUN|CFG_CMD_ASKENV|CFG_CMD_ECHO|CFG_CMD_I2C|CFG_CMD_DHCP|CFG_CMD_CACHE)
-/* 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_BDI
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ECHO
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_RUN
+
 
 #define CONFIG_BOOTDELAY       3
 /* #define CONFIG_BOOTARGS     "root=/dev/nfs ip=bootp console=ttyS0,19200" */
@@ -112,11 +136,11 @@
 /*
  * I2C bus
  */
-#define CONFIG_HARD_I2C                1
-#define CFG_I2C_SPEED                  50000
-#define CFG_I2C_SLAVE                  0xfe
+#define CONFIG_HARD_I2C                        1
+#define CFG_I2C_SPEED                  50000
+#define CFG_I2C_SLAVE                  0xfe
 
-#define CFG_ENV_IS_IN_EEPROM           1
+#define CFG_ENV_IS_IN_EEPROM           1
 
 #define CFG_ENV_OFFSET                 0x00    /* environment starts here  */
 #define CFG_ENV_SIZE                   1024    /* 1 KiB                    */