[PATCH next v7 11/12] configs: aspeed: Make EXTRA_ENV_SETTINGS board specific

[Joel Stanley]

On Wed, 20 Oct 2021 at 02:50, Chia-Wei Wang <chiawei_wang at aspeedtech.com> wrote:
>
> Move CONFIG_EXTRA_ENV_SETTINGS to board-specific
> configuration headers.
>
> Signed-off-by: Chia-Wei Wang <chiawei_wang at aspeedtech.com>
> ---
>  include/configs/aspeed-common.h | 9 ---------
>  include/configs/evb_ast2500.h   | 9 +++++++++
>  include/configs/evb_ast2600.h   | 9 +++++++++
>  3 files changed, 18 insertions(+), 9 deletions(-)
>
> diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
> index 5177bf20fa..96526e1a75 100644
> --- a/include/configs/aspeed-common.h
> +++ b/include/configs/aspeed-common.h
> @@ -38,13 +38,4 @@
>   */
>  #define CONFIG_BOOTP_BOOTFILESIZE
>
> -/*
> - * Miscellaneous configurable options
> - */
> -
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> -       "verify=yes\0"  \

Does this impact any of the code we have enabled? It appears bootm
sets verify unconditionally when CONFIG_FIT_SIGNATURE is enabled.

> -       "spi_dma=yes\0" \
> -       ""

The spi_dma option isn't supported by any code in u-boot. Can we drop it?

> -
>  #endif /* __AST_COMMON_CONFIG_H */
> diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h
> index dc032c1a41..a886fd941e 100644
> --- a/include/configs/evb_ast2500.h
> +++ b/include/configs/evb_ast2500.h
> @@ -13,4 +13,13 @@
>
>  #define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
>
> +/* Memory Info */
> +#define CONFIG_SYS_LOAD_ADDR           0x83000000
> +
> +/* Misc */
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> +       "verify=yes\0"  \
> +       "spi_dma=yes\0" \
> +       ""
> +
>  #endif /* __CONFIG_H */
> diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
> index 177a52eb91..d2aceb6663 100644
> --- a/include/configs/evb_ast2600.h
> +++ b/include/configs/evb_ast2600.h
> @@ -10,4 +10,13 @@
>
>  #define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
>
> +/* Memory Info */
> +#define CONFIG_SYS_LOAD_ADDR           0x83000000
> +
> +/* Misc */
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> +       "verify=yes\0"  \
> +       "spi_dma=yes\0" \
> +       ""
> +
>  #endif /* __CONFIG_H */
> --
> 2.17.1
>