From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Hershberger Date: Fri, 10 Jun 2016 10:34:13 -0500 Subject: [U-Boot] [PATCH 4/5] autoboot: fix a bunch of misconversion of CONFIG_BOOTDELAY In-Reply-To: <20160610152839.GY11619@bill-the-cat> References: <1465572021-13692-1-git-send-email-yamada.masahiro@socionext.com> <1465572021-13692-5-git-send-email-yamada.masahiro@socionext.com> <20160610152839.GY11619@bill-the-cat> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, On Fri, Jun 10, 2016 at 10:28 AM, Tom Rini wrote: > 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 Please be sure that you leave out 11/21 from that series. > that fixes more new platforms as I bring them in. Thanks for working on > this! Thanks, -Joe