[U-Boot] [U-Boot, v2, 7/7] configs: sama5d3_xplained: move CONFIG_SYS_NO_FLASH to defconfig

[Andreas Bießmann]

On Tue, Feb 07, 2017 at 04:40:04PM +0800, Wenyou Yang wrote:
> Move CONFIG_SYS_NO_FLASH to the configs/sama5d3x_xplained_*_defconfig
> files.

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

Andreas
> 
> Signed-off-by: Wenyou Yang <wenyou.yang at atmel.com>
> ---
> 
> Changes in v2:
>  - rebase on the patch set:
>         [PATCH v3 0/8] board: sama5d4: convert boards to support DM/DT
>         http://lists.denx.de/pipermail/u-boot/2017-February/280506.html
> 
>  configs/sama5d3_xplained_mmc_defconfig       | 1 +
>  configs/sama5d3_xplained_nandflash_defconfig | 1 +
>  include/configs/sama5d3_xplained.h           | 3 ---
>  3 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
> index a9890cc3d3..49089664de 100644
> --- a/configs/sama5d3_xplained_mmc_defconfig
> +++ b/configs/sama5d3_xplained_mmc_defconfig
> @@ -12,6 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d3_xplained"
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC"
>  CONFIG_BOOTDELAY=3
> +CONFIG_SYS_NO_FLASH=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_SPL=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
> index 05798d666c..5f427c4bbd 100644
> --- a/configs/sama5d3_xplained_nandflash_defconfig
> +++ b/configs/sama5d3_xplained_nandflash_defconfig
> @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d3_xplained"
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH"
>  CONFIG_BOOTDELAY=3
> +CONFIG_SYS_NO_FLASH=y
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_SPL=y
>  CONFIG_HUSH_PARSER=y
> diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
> index 85997a6281..f98643a963 100644
> --- a/include/configs/sama5d3_xplained.h
> +++ b/include/configs/sama5d3_xplained.h
> @@ -10,9 +10,6 @@
>  #ifndef __CONFIG_H
>  #define __CONFIG_H
>  
> -/* No NOR flash, this definition should put before common header */
> -#define CONFIG_SYS_NO_FLASH
> -
>  #include "at91-sama5_common.h"
>  
>  /*