diff mbox

[U-Boot,1/3] 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

Message ID 1435518312-1643-2-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/config_distro_defaults.h | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Jagan Teki June 28, 2015, 7:27 p.m. UTC | #1 
This isn't a proper patch setup - please try to add short note line on
subject head and description on body.

On 29 June 2015 at 00:35, Dennis Gilmore <dennis@ausil.us> wrote:
> Signed-off-by: Dennis Gilmore <dennis@ausil.us>
> ---
>  include/config_distro_defaults.h | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
> index bd8fbca..d8165cc 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__)
> --
> 2.4.3
>

thanks!
Tom Rini Aug. 13, 2015, 1:17 p.m. UTC | #2 
On Sun, Jun 28, 2015 at 02:05:10PM -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/config_distro_defaults.h b/include/config_distro_defaults.h
index bd8fbca..d8165cc 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__)