Move setting CONFIG_BOOTP_VCI_STRING to before including the vexpress-common header

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

diff --git a/include/configs/adp-ag101.h b/include/configs/adp-ag101.h
index 81f71b9b726dc294bdb36e284ec66ee58dfe0a35..141fc99ceae5eb35addfbe322dd0fb1df19e0fff 100644 (file)
--- a/include/configs/adp-ag101.h
+++ b/include/configs/adp-ag101.h
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/ag101.h>
+#include <asm/arch-ag101/ag101.h>
 
 /*
  * CPU and Board Configuration Options
@@ -40,12 +40,6 @@
 /*
  * Timer
  */
-
-/*
- * According to the discussion in u-boot mailing list before,
- * CONFIG_SYS_HZ at 1000 is mandatory.
- */
-#define CONFIG_SYS_HZ          1000
 #define CONFIG_SYS_CLK_FREQ    48000000
 #define VERSION_CLOCK          CONFIG_SYS_CLK_FREQ
 
@@ -115,8 +109,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_PING
@@ -144,11 +136,6 @@
 /* 512kB is suggested, (CONFIG_ENV_SIZE + 128 * 1024) was not enough */
 #define CONFIG_SYS_MALLOC_LEN          (512 << 10)
 
-/*
- * size in bytes reserved for initial data
- */
-#define CONFIG_SYS_GBL_DATA_SIZE       128
-
 /*
  * AHB Controller configuration
  */