Move setting CONFIG_BOOTP_VCI_STRING to before including the vexpress-common header

[karo-tx-uboot.git] / include / configs / zmx25.h

diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 765b849e25a48b78501a89fcb421bea719e19f3e..bc9b8336b1dfbb66f795351f014b48b985a84062 100644 (file)
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -10,11 +10,16 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_ARM926EJS                       /* arm926ejs CPU core */
-#define CONFIG_MX25
-#define CONFIG_SYS_HZ                  1000
+#include <asm/arch/imx-regs.h>
+
 #define CONFIG_SYS_TEXT_BASE           0xA0000000
 
+#define CONFIG_SYS_GENERIC_BOARD
+
+#define CONFIG_SYS_TIMER_RATE          32768
+#define CONFIG_SYS_TIMER_COUNTER       \
+       (&((struct gpt_regs *)IMX_GPT1_BASE)->counter)
+
 #define CONFIG_MACH_TYPE       MACH_TYPE_ZMX25
 /*
  * Environment settings
@@ -71,8 +76,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_CACHE
 
 /*
@@ -145,10 +148,6 @@
 #define CONFIG_PREBOOT  ""
 
 #define CONFIG_BOOTDELAY       5
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "boot in %d s\n", bootdelay
-#define CONFIG_AUTOBOOT_DELAY_STR      "delaygs"
-#define CONFIG_AUTOBOOT_STOP_STR       "stopgs"
 
 /*
  * Size of malloc() pool