[U-Boot] [PATCH 4/7] arm: Make new baltos board not break on savedefconfig

[Joe Hershberger]

Hi Tom,

On Wed, Jun 24, 2015 at 2:33 AM, Yegor Yefremov
<yegorslists at googlemail.com> wrote:
> On Wed, Jun 24, 2015 at 8:55 AM, Yegor Yefremov
> <yegorslists at googlemail.com> wrote:
>> Hi Joe,
>>
>> On Wed, Jun 24, 2015 at 5:26 AM, Joe Hershberger
>> <joe.hershberger at gmail.com> wrote:
>>> Hi Tom,
>>>
>>> On Tue, Jun 23, 2015 at 9:23 AM, Tom Rini <trini at konsulko.com> wrote:
>>>> On Mon, Jun 22, 2015 at 04:15:27PM -0500, Joe Hershberger wrote:
>>>>
>>>>> This config defined a CONS_INDEX as a config but did not define it in
>>>>> any Kconfig, so savedefconfig will delete that entry. Use
>>>>> CONFIG_SYS_EXTRA_OPTIONS for now until that is added to Kconfig.
>>>>>
>>>>> Signed-off-by: Joe Hershberger <joe.hershberger at ni.com>
>>>>> ---
>>>>>
>>>>>  configs/am335x_baltos_defconfig | 3 +--
>>>>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
>>>>> index 679b04f..030cb51 100644
>>>>> --- a/configs/am335x_baltos_defconfig
>>>>> +++ b/configs/am335x_baltos_defconfig
>>>>> @@ -1,7 +1,6 @@
>>>>>  CONFIG_SPL=y
>>>>>  CONFIG_SPL_STACK_R=y
>>>>>  CONFIG_SPL_STACK_R_ADDR=0x82000000
>>>>> -CONFIG_SYS_EXTRA_OPTIONS="NAND"
>>>>> -CONFIG_CONS_INDEX=1
>>>>> +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND"
>>>>>  CONFIG_ARM=y
>>>>>  CONFIG_TARGET_AM335X_BALTOS=y
>>>>
>>>> No, something else is wrong.  board/vscom/baltos/Kconfig has CONS_INDEX
>>>> (like the other am335x boards and yes this needs moving to a better
>>>> place).
>>>
>>> Any thoughts on what's wrong, then? I'm at FTF this week and won't be
>>> debugging it until next week. There was an issue with this board,
>>> caused by savedefconfig, which is why I even noticed this board exists
>>> now. Maybe whoever added it (Yegor Yefremov) didn't try safedefconfig
>>> against the board?
>>>
>>> If nothing else, at least this makes it consistent with all other
>>> boards that specify CONS_INDEX. At least they don't break.
>>
>> I'll take a look at this.
>
> I've pulled the latest master
> (325849ff3d4adeebb8f8f9bc5db950724df9bc21) and tried:
>
> make am35x_baltos_defconfig
> make savedefconfg
> make
>
> and aside from CONS_INDEX disappearing I see no problems. And "make
> menuconfig" still shows CONS_INDEX = 1.

It seems this is another case of being bitten by the default value. It
seems I can either move the definition from its current location in
board/vscom/baltos/Kconfig to the root Kconfig or maybe the
common/Kconfig and make the default be 0 (which will bring back the
entry) and move other boards out of CONFIG_SYS_EXTRA_OPTIONS... or I
can add to this patch deleting the definition in
board/vscom/baltos/Kconfig and wait until later to move it properly
for all boards.

Cheers,
-Joe