diff mbox

[U-Boot,2/3] Move setting CONFIG_BOOTP_VCI_STRING to before including the vexpress-common header

Message ID 1435518312-1643-3-git-send-email-dennis@ausil.us
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Dennis Gilmore June 28, 2015, 7:05 p.m. UTC
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
---
 include/configs/vexpress_ca15_tc2.h | 2 +-
 include/configs/vexpress_ca5x2.h    | 2 +-
 include/configs/vexpress_ca9x4.h    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Tom Rini Aug. 13, 2015, 1:17 p.m. UTC | #1
On Sun, Jun 28, 2015 at 02:05:11PM -0500, Dennis Gilmore wrote:

> Signed-off-by: Dennis Gilmore <dennis@ausil.us>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h
index b43afa2..59b6310 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 7719d59..a4ffdf5 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 38ac4ed..71233d8 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 */