summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2015-06-28 14:05:10 -0500
committerTom Rini <trini@konsulko.com>2015-08-12 12:08:20 -0400
commit2100f22fcbcfa8c36a9ae13f2d76092a917c974b (patch)
tree16f27c76ac4b7a2ed8f63ce36e32078e2a100c7a /include
parent32b4a8a2a5aff307b24ec8e41a82f715ca4a6aab (diff)
downloadtalos-obmc-uboot-2100f22fcbcfa8c36a9ae13f2d76092a917c974b.tar.gz
talos-obmc-uboot-2100f22fcbcfa8c36a9ae13f2d76092a917c974b.zip
PXE: if a board has set its own value for CONFIG_BOOTP_VCI_STRING do not set the default one. Use the board set value instead
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
Diffstat (limited to 'include')
-rw-r--r--include/config_distro_defaults.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index bd8fbcafc2..d8165cc80e 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -23,12 +23,18 @@
#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__)
OpenPOWER on IntegriCloud