[U-Boot] [PATCH v2] ARM: socfpga: use the default CONFIG_BOOTDELAY=2

[Marek Vasut]

On 07/24/2016 06:38 PM, Masahiro Yamada wrote:
> This option controls how long it should be paused before entering
> the auto-boot mode.  The default value from Kconfig should be fine
> except socfpga_vining_fpga_defconfig.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>

Applied, thanks

> ---
> 
> Changes in v2:
>   - Keep socfpga_vining_fpga_defconfig untouched
> 
>  configs/socfpga_arria5_defconfig       | 1 -
>  configs/socfpga_cyclone5_defconfig     | 1 -
>  configs/socfpga_de0_nano_soc_defconfig | 1 -
>  configs/socfpga_is1_defconfig          | 1 -
>  configs/socfpga_mcvevk_defconfig       | 1 -
>  configs/socfpga_sockit_defconfig       | 1 -
>  configs/socfpga_socrates_defconfig     | 1 -
>  configs/socfpga_sr1500_defconfig       | 1 -
>  8 files changed, 8 deletions(-)
> 
> diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
> index 2478ae5..1bec969 100644
> --- a/configs/socfpga_arria5_defconfig
> +++ b/configs/socfpga_arria5_defconfig
> @@ -10,7 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_FIT=y
> -CONFIG_BOOTDELAY=3
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
> index 1619b86..0437cbe 100644
> --- a/configs/socfpga_cyclone5_defconfig
> +++ b/configs/socfpga_cyclone5_defconfig
> @@ -10,7 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_FIT=y
> -CONFIG_BOOTDELAY=3
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
> index 43d939b..7c05e6a 100644
> --- a/configs/socfpga_de0_nano_soc_defconfig
> +++ b/configs/socfpga_de0_nano_soc_defconfig
> @@ -10,7 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_FIT=y
> -CONFIG_BOOTDELAY=3
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig
> index 658770b..58661c0 100644
> --- a/configs/socfpga_is1_defconfig
> +++ b/configs/socfpga_is1_defconfig
> @@ -9,7 +9,6 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_FIT=y
> -CONFIG_BOOTDELAY=3
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
> index c5c662b..517a6de 100644
> --- a/configs/socfpga_mcvevk_defconfig
> +++ b/configs/socfpga_mcvevk_defconfig
> @@ -10,7 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_FIT=y
> -CONFIG_BOOTDELAY=3
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
> index 1c4a40d..9bd3331 100644
> --- a/configs/socfpga_sockit_defconfig
> +++ b/configs/socfpga_sockit_defconfig
> @@ -10,7 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_FIT=y
> -CONFIG_BOOTDELAY=3
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
> index e34d13e..5347032 100644
> --- a/configs/socfpga_socrates_defconfig
> +++ b/configs/socfpga_socrates_defconfig
> @@ -10,7 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_FIT=y
> -CONFIG_BOOTDELAY=3
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
> index d1cfbcd..81a3fc1 100644
> --- a/configs/socfpga_sr1500_defconfig
> +++ b/configs/socfpga_sr1500_defconfig
> @@ -10,7 +10,6 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
>  CONFIG_FIT=y
> -CONFIG_BOOTDELAY=3
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
> 


-- 
Best regards,
Marek Vasut