summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2015-06-28 14:05:11 -0500
committerTom Rini <trini@konsulko.com>2015-08-12 12:08:20 -0400
commit1a11ab8dc82cde2535dbb48c7d46b32d06a016ba (patch)
tree26aa3b1293ab53c1217a1ee1e34ef9440ea0c541
parent2100f22fcbcfa8c36a9ae13f2d76092a917c974b (diff)
Move setting CONFIG_BOOTP_VCI_STRING to before including the vexpress-common header
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
-rw-r--r--include/configs/vexpress_ca15_tc2.h2
-rw-r--r--include/configs/vexpress_ca5x2.h2
-rw-r--r--include/configs/vexpress_ca9x4.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h
index b43afa2938..59b6310b57 100644
--- a/include/configs/vexpress_ca15_tc2.h
+++ b/include/configs/vexpress_ca15_tc2.h
@@ -12,8 +12,8 @@
#define __VEXPRESS_CA15X2_TC2_h
#define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
-#include "vexpress_common.h"
#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca15x2_tc2"
+#include "vexpress_common.h"
#define CONFIG_SYSFLAGS_ADDR 0x1c010030
#define CONFIG_SMP_PEN_ADDR CONFIG_SYSFLAGS_ADDR
diff --git a/include/configs/vexpress_ca5x2.h b/include/configs/vexpress_ca5x2.h
index 7719d59e15..a4ffdf54db 100644
--- a/include/configs/vexpress_ca5x2.h
+++ b/include/configs/vexpress_ca5x2.h
@@ -12,7 +12,7 @@
#define __VEXPRESS_CA5X2_h
#define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
-#include "vexpress_common.h"
#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca5x2"
+#include "vexpress_common.h"
#endif /* __VEXPRESS_CA5X2_h */
diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
index 38ac4ed38d..71233d8c3f 100644
--- a/include/configs/vexpress_ca9x4.h
+++ b/include/configs/vexpress_ca9x4.h
@@ -12,7 +12,7 @@
#define __VEXPRESS_CA9X4_H
#define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
-#include "vexpress_common.h"
#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca9x4"
+#include "vexpress_common.h"
#endif /* VEXPRESS_CA9X4_H */