PXE: if a board has set its own value for CONFIG_BOOTP_VCI_STRING do not set the...
authorDennis Gilmore <dennis@ausil.us>
Sun, 28 Jun 2015 19:05:10 +0000 (14:05 -0500)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 10 Sep 2015 06:17:43 +0000 (08:17 +0200)
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
include/config_distro_defaults.h

index bd8fbca..d8165cc 100644 (file)
 #if defined(__arm__) || defined(__aarch64__)
 #define CONFIG_BOOTP_PXE_CLIENTARCH     0x100
 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
+#if !defined(CONFIG_BOOTP_VCI_STRING)
 #define CONFIG_BOOTP_VCI_STRING         "U-boot.armv7"
+#endif
 #elif defined(__aarch64__)
+#if !defined(CONFIG_BOOTP_VCI_STRING)
 #define CONFIG_BOOTP_VCI_STRING         "U-boot.armv8"
+#endif
 #else
+#if !defined(CONFIG_BOOTP_VCI_STRING)
 #define CONFIG_BOOTP_VCI_STRING         "U-boot.arm"
 #endif
+#endif
 #elif defined(__i386__)
 #define CONFIG_BOOTP_PXE_CLIENTARCH     0x0
 #elif defined(__x86_64__)