[U-Boot] [PATCH v2 8/8] configs: sama5d4: move CONFIG_SYS_NO_FLASH to *defconfig
Andreas Bießmann
andreas at biessmann.de
Mon Feb 6 09:12:09 UTC 2017
On 2016-10-28 09:16, Wenyou Yang wrote:
> Move CONFIG_SYS_NO_FLASH to the configs/sama5d4*_defconfig file.
>
> Signed-off-by: Wenyou Yang <wenyou.yang at atmel.com>
Reviewed-by: Andreas Bießmann <andreas at biessmann.org>
> ---
>
> Changes in v2: None
>
> configs/sama5d4_xplained_mmc_defconfig | 1 +
> configs/sama5d4_xplained_nandflash_defconfig | 1 +
> configs/sama5d4_xplained_spiflash_defconfig | 1 +
> configs/sama5d4ek_mmc_defconfig | 1 +
> configs/sama5d4ek_nandflash_defconfig | 1 +
> configs/sama5d4ek_spiflash_defconfig | 1 +
> include/configs/sama5d4_xplained.h | 3 ---
> include/configs/sama5d4ek.h | 3 ---
> 8 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/configs/sama5d4_xplained_mmc_defconfig
> b/configs/sama5d4_xplained_mmc_defconfig
> index e7518e8..dfd6070 100644
> --- a/configs/sama5d4_xplained_mmc_defconfig
> +++ b/configs/sama5d4_xplained_mmc_defconfig
> @@ -12,6 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,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/sama5d4_xplained_nandflash_defconfig
> b/configs/sama5d4_xplained_nandflash_defconfig
> index 790d7d1..3ac745c 100644
> --- a/configs/sama5d4_xplained_nandflash_defconfig
> +++ b/configs/sama5d4_xplained_nandflash_defconfig
> @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,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/configs/sama5d4_xplained_spiflash_defconfig
> b/configs/sama5d4_xplained_spiflash_defconfig
> index af6263f..bd3353b 100644
> --- a/configs/sama5d4_xplained_spiflash_defconfig
> +++ b/configs/sama5d4_xplained_spiflash_defconfig
> @@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d4_xplained"
> CONFIG_FIT=y
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
> 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/sama5d4ek_mmc_defconfig
> b/configs/sama5d4ek_mmc_defconfig
> index 76b7855..799fbbc 100644
> --- a/configs/sama5d4ek_mmc_defconfig
> +++ b/configs/sama5d4ek_mmc_defconfig
> @@ -14,6 +14,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,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_SPL=y
> CONFIG_HUSH_PARSER=y
> diff --git a/configs/sama5d4ek_nandflash_defconfig
> b/configs/sama5d4ek_nandflash_defconfig
> index 1bef322..cf2d714 100644
> --- a/configs/sama5d4ek_nandflash_defconfig
> +++ b/configs/sama5d4ek_nandflash_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,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/sama5d4ek_spiflash_defconfig
> b/configs/sama5d4ek_spiflash_defconfig
> index bd7325e..67e2fab 100644
> --- a/configs/sama5d4ek_spiflash_defconfig
> +++ b/configs/sama5d4ek_spiflash_defconfig
> @@ -13,6 +13,7 @@
> CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
> 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/include/configs/sama5d4_xplained.h
> b/include/configs/sama5d4_xplained.h
> index 8032164..68d7bcf 100644
> --- a/include/configs/sama5d4_xplained.h
> +++ b/include/configs/sama5d4_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"
>
> #define CONFIG_BOARD_EARLY_INIT_F
> diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
> index 964cb6b..fd60540 100644
> --- a/include/configs/sama5d4ek.h
> +++ b/include/configs/sama5d4ek.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"
>
> #define CONFIG_BOARD_EARLY_INIT_F
More information about the U-Boot
mailing list