[U-Boot] [PATCH 4/5] autoboot: fix a bunch of misconversion of CONFIG_BOOTDELAY

Tom Rini
2016-06-10T18:41:44Z

On Sat, Jun 11, 2016 at 12:48:54AM +0900, Masahiro Yamada wrote:
> 2016-06-11 0:43 GMT+09:00 Tom Rini <trini@konsulko.com>:
> > On Sat, Jun 11, 2016 at 12:37:49AM +0900, Masahiro Yamada wrote:
> >> 2016-06-11 0:28 GMT+09:00 Tom Rini <trini@konsulko.com>:
> >> > On Sat, Jun 11, 2016 at 12:20:20AM +0900, Masahiro Yamada wrote:
> >> >
> >> >> Commit bb597c0eeb7e ("common: bootdelay: move CONFIG_BOOTDELAY into
> >> >> a Kconfig option") is wrong in multiple ways.
> >> >>
> >> >> First of all, it made tons of misconversion.
> >> >>
> >> >> [1] CONFIG_BOOTDELAY=-1 all gone
> >> >> [2] CONFIG_BOOTDELAY=1 all gone
> >> >> [3] CONFIG_BOOTDELAY=2 all gone
> >> >>
> >> >> They all disappeared, and all of the misconverted boards now use the
> >> >> default value, CONFIG_BOOTDELAY=0, which came from the Kconfig entry.
> >> >>
> >> >> I assume some reasons for the misconversion.
> >> >>
> >> >> For [1], due to the bug of tools/scripts/define2mk.sed (now fixed),
> >> >> #define CONFIG_BOOTDELAY -1
> >> >> was converted to
> >> >> CONFIG_BOOTDELAY="-1"
> >> >> in the include/autoconf.mk
> >> >>
> >> >> So, the tools/moveconfig.py considered it as a string option, and
> >> >> failed to move it.
> >> >>
> >> >> For [2], as you see in the comment of tools/scripts/define2mk.sed,
> >> >> #define CONFIG_BOOTDELAY 1
> >> >> is converted to
> >> >> CONFIG_BOOTDELAY=y
> >> >> in the include/autoconf.mk
> >> >>
> >> >> This needs a special care because we do not know whether we are moving
> >> >> a bool option with value y or an integer option with value 1.
> >> >>
> >> >> The patch for this issue had already been on the Patchwork, but not
> >> >> merged yet.
> >> >>
> >> >> I do not understand the reason for [3] at all.
> >> >>
> >> >> Anyway, I ran the tool based on commit 3191d8408053 (=immediately
> >> >> prior to the bad commit) and generated this patch. Of course, I made
> >> >> sure to not touch the defconfigs added after that commit.
> >> >
> >> > Ug. I also just noticed this now and started fixing, but I didn't see
> >> > [2]. I saw [3] which is because the wrong default value was passed to
> >> > moveconfig.py. I also fixed up a number of other platforms that I'm
> >> > also adding and testing. So, I'm going to grab most of your series, and
> >> > the outstanding updates to moveconfig.py, and then re-generate my patch
> >> > that fixes more new platforms as I bring them in. Thanks for working on
> >> > this!
> >>
> >> Please hold on applying moveconfig patches.
> >>
> >> One patch in my series will be replaced with Joe's one.
> >>
> >> And, I am fixing small issues locally.
> >>
> >> I will arrange everything and send a pull request
> >> when it is ready.
> >
> > OK. Please pick up most of this set of 5 but I'll re-run moveconfig.py
> > on top (since I locally undo configs/ and include/ on bb597c0eeb and
> > then migrate everyone again) so it catches new configs that've come in
> > since. Thanks again!
>
> Sorry, miscommunication..
>
> I was talking about moveconfig in my previous message.
>
> I will collect moveconfig patches (from me and Joe)
> and send a pull-request only for moveconfig.
>
>
>
> I want you to arrange everything about the CONFIG_BOOTDELAY issues.

OK, understood, thanks!

--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160610/1f21144c/attachment.sig>