[U-Boot] [PATCH 2/5] autoboot: follow-up cleanup after CONFIG_BOOTDELAY moves

Heiko Schocher
2016-06-13T04:45:55Z

Hello Masahiro,

Am 10.06.2016 um 17:20 schrieb Masahiro Yamada:
> Tidy up garbage left by commit bb597c0eeb7e ("common: bootdelay: move
> CONFIG_BOOTDELAY into a Kconfig option").
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> include/configs/bfin_adi_common.h | 5 -----
> include/configs/mx6_common.h | 3 ---
> include/configs/mx7_common.h | 3 ---
> include/configs/omap3_cairo.h | 2 --
> 4 files changed, 13 deletions(-)

Thanks!

Reviewed-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
>
> diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
> index 1307607..502ddad 100644
> --- a/include/configs/bfin_adi_common.h
> +++ b/include/configs/bfin_adi_common.h
> @@ -97,11 +97,6 @@
> /*
> * Env Settings
> */
> -#ifndef CONFIG_BOOTDELAY
> -# if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART)
> -# else
> -# endif
> -#endif
> #ifndef CONFIG_BOOTCOMMAND
> # define CONFIG_BOOTCOMMAND "run ramboot"
> #endif
> diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
> index 27f38f4..fb49322 100644
> --- a/include/configs/mx6_common.h
> +++ b/include/configs/mx6_common.h
> @@ -59,9 +59,6 @@
> #endif
> #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
>
> -#ifndef CONFIG_BOOTDELAY
> -#endif
> -
> /* allow to overwrite serial and ethaddr */
> #define CONFIG_ENV_OVERWRITE
> #define CONFIG_CONS_INDEX 1
> diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
> index 5e5656d..fbc6de6 100644
> --- a/include/configs/mx7_common.h
> +++ b/include/configs/mx7_common.h
> @@ -34,9 +34,6 @@
> #define CONFIG_LOADADDR 0x80800000
> #define CONFIG_SYS_TEXT_BASE 0x87800000
>
> -#ifndef CONFIG_BOOTDELAY
> -#endif
> -
> /* allow to overwrite serial and ethaddr */
> #define CONFIG_ENV_OVERWRITE
> #define CONFIG_CONS_INDEX 1
> diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
> index 96c3c4b..82e0d50 100644
> --- a/include/configs/omap3_cairo.h
> +++ b/include/configs/omap3_cairo.h
> @@ -73,8 +73,6 @@
> #define CONFIG_NAND_OMAP_GPMC
> #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
> /* devices */
> -/* override default CONFIG_BOOTDELAY */
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "machid=ffffffff\0" \
> "fdt_high=0x87000000\0" \
>

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany