1
0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00

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>
This commit is contained in:
Dennis Gilmore
2015-06-28 14:05:10 -05:00
committed by Tom Rini
parent 32b4a8a2a5
commit 2100f22fcb

View File

@@ -23,12 +23,18 @@
#if defined(__arm__) || defined(__aarch64__) #if defined(__arm__) || defined(__aarch64__)
#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100 #define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
#if !defined(CONFIG_BOOTP_VCI_STRING)
#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7" #define CONFIG_BOOTP_VCI_STRING "U-boot.armv7"
#endif
#elif defined(__aarch64__) #elif defined(__aarch64__)
#if !defined(CONFIG_BOOTP_VCI_STRING)
#define CONFIG_BOOTP_VCI_STRING "U-boot.armv8" #define CONFIG_BOOTP_VCI_STRING "U-boot.armv8"
#endif
#else #else
#if !defined(CONFIG_BOOTP_VCI_STRING)
#define CONFIG_BOOTP_VCI_STRING "U-boot.arm" #define CONFIG_BOOTP_VCI_STRING "U-boot.arm"
#endif #endif
#endif
#elif defined(__i386__) #elif defined(__i386__)
#define CONFIG_BOOTP_PXE_CLIENTARCH 0x0 #define CONFIG_BOOTP_PXE_CLIENTARCH 0x0
#elif defined(__x86_64__) #elif defined(__x86_64__)