[U-Boot] [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

[Scott Wood]

Please change the title and the rest of the changelog to describe what  
functionality you're adding and why.

On 05/20/2013 01:07:27 AM, ying.zhang at freescale.com wrote:
> diff --git a/common/env_common.c b/common/env_common.c
> index 906b41f..8cb81e9 100644
> --- a/common/env_common.c
> +++ b/common/env_common.c
> @@ -156,7 +156,6 @@ int set_default_vars(int nvars, char * const  
> vars[])
>  				H_NOCLEAR | H_INTERACTIVE, nvars, vars);
>  }
> 
> -#ifndef CONFIG_SPL_BUILD
>  /*
>   * Check if CRC is valid and (if yes) import the environment.
>   * Note that "buf" may or may not be aligned.
> @@ -188,7 +187,6 @@ int env_import(const char *buf, int check)
> 
>  	return 0;
>  }
> -#endif

This ifndef was introduced by Ilya Yanok in commit  
7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56.

Ilya, what are the consequences of removing this?  Is there some other  
symbol we can use here?

> diff --git a/include/configs/MPC8313ERDB.h  
> b/include/configs/MPC8313ERDB.h
> index c28dfe0..a2bdcff 100644
> --- a/include/configs/MPC8313ERDB.h
> +++ b/include/configs/MPC8313ERDB.h
> @@ -40,7 +40,9 @@
>  #define CONFIG_SPL_INIT_MINIMAL
>  #define CONFIG_SPL_SERIAL_SUPPORT
>  #define CONFIG_SPL_NAND_SUPPORT
> +#ifdef CONFIG_SPL_BUILD
>  #define CONFIG_SPL_NAND_MINIMAL
> +#endif
>  #define CONFIG_SPL_FLUSH_IMAGE
>  #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
>  #define CONFIG_SPL_MPC83XX_WAIT_FOR_NAND
> diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
> index 8b13b10..5bdd44a 100644
> --- a/include/configs/P1022DS.h
> +++ b/include/configs/P1022DS.h
> @@ -41,7 +41,9 @@
>  #define CONFIG_SPL_INIT_MINIMAL
>  #define CONFIG_SPL_SERIAL_SUPPORT
>  #define CONFIG_SPL_NAND_SUPPORT
> +#ifdef CONFIG_SPL_BUILD
>  #define CONFIG_SPL_NAND_MINIMAL
> +#endif
>  #define CONFIG_SPL_FLUSH_IMAGE
>  #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
> 
> diff --git a/include/configs/p1_p2_rdb_pc.h  
> b/include/configs/p1_p2_rdb_pc.h
> index 7ed634b..bc48d62 100644
> --- a/include/configs/p1_p2_rdb_pc.h
> +++ b/include/configs/p1_p2_rdb_pc.h
> @@ -159,7 +159,9 @@
>  #define CONFIG_SPL_INIT_MINIMAL
>  #define CONFIG_SPL_SERIAL_SUPPORT
>  #define CONFIG_SPL_NAND_SUPPORT
> +#ifdef CONFIG_SPL_BUILD
>  #define CONFIG_SPL_NAND_MINIMAL
> +#endif
>  #define CONFIG_SPL_FLUSH_IMAGE
>  #define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"

Are you sure this belongs in this patch?

-Scott