[U-Boot] [U-Boot, v2, 4/4] configs: at91sam9x5ek: move SYS_NO_FLASH to defconfig

[Andreas Bießmann]

On Tue, Feb 07, 2017 at 05:11:35PM +0800, Wenyou Yang wrote:
> Move CONFIG_SYS_NO_FLASH to the configs/sama5d4*_defconfig file.
>

this one conflicts with e856bdcfb49291d30b19603fc101bea096c48196, just drop it
from the series.

Andreas 

> Signed-off-by: Wenyou Yang <wenyou.yang at atmel.com>
> Reviewed-by: Simon Glass <sjg at chromium.org>
> ---
> 
> Changes in v2:
>  - rebase on the patch set:
>         [RESEND PATCH v2] ARM: at91: add default config file for sama5d36ek CMP board
>         http://lists.denx.de/pipermail/u-boot/2017-February/280525.html
> 
>  configs/at91sam9x5ek_dataflash_defconfig | 1 +
>  configs/at91sam9x5ek_mmc_defconfig       | 1 +
>  configs/at91sam9x5ek_nandflash_defconfig | 1 +
>  configs/at91sam9x5ek_spiflash_defconfig  | 1 +
>  include/configs/at91sam9x5ek.h           | 3 ---
>  5 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
> index d7408e8b29..8351281a79 100644
> --- a/configs/at91sam9x5ek_dataflash_defconfig
> +++ b/configs/at91sam9x5ek_dataflash_defconfig
> @@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH"
>  CONFIG_BOOTDELAY=3
>  # CONFIG_CONSOLE_MUX is not set
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> +CONFIG_SYS_NO_FLASH=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
> index 07f62fc38b..6d212d40e8 100644
> --- a/configs/at91sam9x5ek_mmc_defconfig
> +++ b/configs/at91sam9x5ek_mmc_defconfig
> @@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC"
>  CONFIG_BOOTDELAY=3
>  # CONFIG_CONSOLE_MUX is not set
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> +CONFIG_SYS_NO_FLASH=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
> index 15ac465abd..d90481ec1c 100644
> --- a/configs/at91sam9x5ek_nandflash_defconfig
> +++ b/configs/at91sam9x5ek_nandflash_defconfig
> @@ -11,6 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
>  CONFIG_BOOTDELAY=3
>  # CONFIG_CONSOLE_MUX is not set
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> +CONFIG_SYS_NO_FLASH=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_SPL=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
> index d44d851848..b9fbf39d08 100644
> --- a/configs/at91sam9x5ek_spiflash_defconfig
> +++ b/configs/at91sam9x5ek_spiflash_defconfig
> @@ -6,6 +6,7 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH"
>  CONFIG_BOOTDELAY=3
>  # CONFIG_CONSOLE_MUX is not set
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
> +CONFIG_SYS_NO_FLASH=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="U-Boot> "
> diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
> index a11d5748da..c133eb85ab 100644
> --- a/include/configs/at91sam9x5ek.h
> +++ b/include/configs/at91sam9x5ek.h
> @@ -50,9 +50,6 @@
>  #define CONFIG_BOOTP_GATEWAY
>  #define CONFIG_BOOTP_HOSTNAME
>  
> -/* no NOR flash */
> -#define CONFIG_SYS_NO_FLASH
> -
>  /*
>   * Command line configuration.
>   */