public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Soeren Moch <smoch@web.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 5/5] autoboot: add CONFIG_AUTOBOOT to allow to not compile autoboot.c
Date: Fri, 10 Jun 2016 23:55:40 +0200	[thread overview]
Message-ID: <575B375C.5050600@web.de> (raw)
In-Reply-To: <1465572021-13692-6-git-send-email-yamada.masahiro@socionext.com>



On 10.06.2016 17:20, Masahiro Yamada wrote:
> Another mistake of commit bb597c0eeb7e ("common: bootdelay: move
> CONFIG_BOOTDELAY into a Kconfig option") is that CONFIG_BOOTDELAY
> is now defined for all the boards.
> 
> Before that commit, it is allowed to unset CONFIG_BOOTDELAY to not
> compile common/autoboot.c
> 
> This is apparent from the code in common/Makefile:
> 
>   # This option is not just y/n - it can have a numeric value
>   ifdef CONFIG_BOOTDELAY
>   obj-y += autoboot.o
>   endif
> 
> (and from the #ifdef in the include/autoconf.h, too.)
> It was a bit odd to enable/disable code with an integer type option,
> but anyway it was how this option worked before that commit.
> Actually several boards unset it to opt out of the autoboot feature.
> 
> This commit adds a bool option, CONFIG_AUTOBOOT, and have the
> CONFIG_BOOTDELAY to depend on it.
> 
> I chose "default y" for this option because most of boards enable the
> autoboot.  I added "# CONFIG_AUTOBOOT is not set" for the boards that
> did not set CONFIG_BOOTDELAY prior to the bad commit.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---

[...]

> diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
> index dc69b39..5d0de21 100644
> --- a/configs/tbs2910_defconfig
> +++ b/configs/tbs2910_defconfig
> @@ -4,6 +4,7 @@ CONFIG_TARGET_TBS2910=y
>  CONFIG_FIT=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="Matrix U-Boot> "
> +# CONFIG_AUTOBOOT is not set
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MEMTEST=y

"+# CONFIG_AUTOBOOT is not set" seems to be wrong for tbs2910.
Before this move to Kconfig we had
"#define CONFIG_BOOTDELAY       3"
via include/configs/mx6_common.h for tbs2910 and for a lot of other imx6
boards.

So the right fix would be to readd 3 seconds bootdelay here.

Adding Stefano (for imx boards) to the cc list.

Regards,
Soeren

  reply	other threads:[~2016-06-10 21:55 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-10 15:20 [U-Boot] [PATCH 0/5] Urgent fixes for misconverted CONFIG_BOOTDELAY Masahiro Yamada
2016-06-10 15:20 ` [U-Boot] [PATCH 1/5] ARM: stm32: remove unused CONFIG_AUTOBOOT Masahiro Yamada
2016-06-10 15:20 ` [U-Boot] [PATCH 2/5] autoboot: follow-up cleanup after CONFIG_BOOTDELAY moves Masahiro Yamada
2016-06-13  4:45   ` Heiko Schocher
2016-06-10 15:20 ` [U-Boot] [PATCH 3/5] tools: fix define2mk.sed to not add quotes around negative integers Masahiro Yamada
2016-06-13  4:47   ` Heiko Schocher
2016-06-10 15:20 ` [U-Boot] [PATCH 4/5] autoboot: fix a bunch of misconversion of CONFIG_BOOTDELAY Masahiro Yamada
2016-06-10 15:28   ` Tom Rini
2016-06-10 15:34     ` Joe Hershberger
2016-06-10 15:37       ` Tom Rini
2016-06-10 15:37     ` Masahiro Yamada
2016-06-10 15:43       ` Tom Rini
2016-06-10 15:48         ` Masahiro Yamada
2016-06-10 18:41           ` Tom Rini
2016-06-10 15:20 ` [U-Boot] [PATCH 5/5] autoboot: add CONFIG_AUTOBOOT to allow to not compile autoboot.c Masahiro Yamada
2016-06-10 21:55   ` Soeren Moch [this message]
2016-06-10 22:19     ` Tom Rini
2016-06-10 22:38       ` Soeren Moch
2016-06-10 23:13         ` Tom Rini
2016-06-11  6:57           ` Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=575B375C.5050600@web.de \
    --to=smoch@web.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox