[PATCH u-boot v2016.07-aspeed-openbmc] Aspeed: ast-g5 change configuration order to allow 2-nd boot

[Joel Stanley]

On Mon, Jun 26, 2017 at 11:16 PM, Mykola Kostenok
<c_mykolak at mellanox.com> wrote:
> Thanks for your attention.
>
> Best regards. Mykola Kostenok.
>
>> -----Original Message-----
>> From: joel.stan at gmail.com [mailto:joel.stan at gmail.com] On Behalf Of Joel
>> Stanley
>> Sent: Monday, June 26, 2017 1:15 PM
>> To: Mykola Kostenok <c_mykolak at mellanox.com>
>> Cc: OpenBMC Maillist <openbmc at lists.ozlabs.org>
>> Subject: Re: [PATCH u-boot v2016.07-aspeed-openbmc] Aspeed: ast-g5
>> change configuration order to allow 2-nd boot
>>
>> On Fri, Jun 2, 2017 at 6:47 PM, Mykola Kostenok
>> <c_mykolak at mellanox.com> wrote:
>> > +config FIRMWARE_2ND_BOOT
>> > +       bool "Firmware second boot WD2 enable."
>> > +       default n
>>
>> Looking at the most recent platform.S for the G5:
>>
>> /**********************************************************
>> ********************
>>  Disable WDT2 for 2nd boot function
>>
>> **********************************************************
>> ********************/
>> /*
>> #ifndef CONFIG_FIRMWARE_2ND_BOOT
>>     ldr   r0, =0x1e78502c
>>     mov   r1, #0
>>     str   r1, [r0]
>> #endif
>>
>> By setting this option we disable this code, so we do not clear the
>> WDT2 status register.
>>
>> The help text for your Kconfig option is confusing; I would think that it means
>> we enable WDT2.
>>
>> Can you clarify?
>>
>
> We can change help text to "Firmware second boot support enable".
> By default after power up WDT2 enabled. This code disable WDT2 in u-boot.
> So when CONFIG_FIRMWARE_2ND_BOOT defined - WDT2 not disabled in u-boot.

Ok. The current version of platform.S has this entire chunk commented
out, so the state of CONFIG_FIRMWARE_2ND_BOOT is irrelevant.

 https://github.com/openbmc/u-boot/blob/ed9e4abbf3f0aab348bc64d5439aadda03f42e4c/arch/arm/mach-aspeed/platform_g5.S#L612

Do you need WDT2 disabled in u-boot? With your other changes applied
you should be able to drop to the prompt, etc, and the watchdog is
serviced.