Please pull u-boot-marvell/master

Hi Tom,
please pull the 2nd batch of MVEBU related patches in this merge window. The major changes are:
---------------------------------------------------------------- - mvebu bubt cmd: Add A38x support (Joel) - Clearfog: Fix SCSI boot duplication (Joel) - Armada-37xx: Fix DDR PHY clock divider values (Marek) ----------------------------------------------------------------
Here the Azure build, without any issues:
https://dev.azure.com/sr0718/u-boot/_build/results?buildId=5&view=result...
Thanks, Stefan
The following changes since commit bdcb29960e3a9558803632783b922f26993d219e:
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2020-04-21 15:20:42 -0400)
are available in the Git repository at:
git@gitlab.denx.de:u-boot/custodians/u-boot-marvell.git
for you to fetch changes up to f60a66ef5d7da1980f180cd1cbfd2ce01157e522:
cmd: mvebu: bubt: show image boot device (2020-04-22 14:28:15 +0200)
---------------------------------------------------------------- Joel Johnson (7): arm: mvebu: clearfog: adjust SCSI boot duplication arm: mvebu: correct SPL boot configs for SPI/MMC cmd: mvebu: bubt: add A38x support cmd: mvebu: bubt: correct U-Boot spelling cmd: mvebu: bubt: verify A38x target device type arm: mvebu: clearfog: enable bubt command cmd: mvebu: bubt: show image boot device
Marek Behún (1): clk: armada-37xx-periph: fix DDR PHY clock divider values
arch/arm/mach-mvebu/Kconfig | 12 +++ cmd/mvebu/bubt.c | 133 +++++++++++++++++++++++++++++++-- configs/clearfog_defconfig | 4 +- configs/controlcenterdc_defconfig | 4 - configs/db-88f6720_defconfig | 4 - configs/db-88f6820-amc_defconfig | 4 - configs/db-88f6820-gp_defconfig | 4 - configs/db-mv784mp-gp_defconfig | 3 - configs/ds414_defconfig | 3 - configs/helios4_defconfig | 1 - configs/maxbcm_defconfig | 3 - configs/theadorable_debug_defconfig | 3 - configs/turris_omnia_defconfig | 4 - configs/x530_defconfig | 4 - drivers/clk/mvebu/armada-37xx-periph.c | 4 +- include/configs/clearfog.h | 7 -- include/configs/helios4.h | 5 -- 17 files changed, 142 insertions(+), 60 deletions(-)

On Wed, Apr 22, 2020 at 04:48:33PM +0200, Stefan Roese wrote:
Hi Tom,
please pull the 2nd batch of MVEBU related patches in this merge window. The major changes are:
Applied to u-boot/master, thanks!
But the following checkpatch should be fixed in a follow up sometime: WARNING: quoted string split across lines #28: FILE: cmd/mvebu/bubt.c:734: + printf("Error: A38x image meant to be " + "booted from "%s", not "%s"!\n",
(There's another but I think the split is fine for how humans would grep for it).

On 22.04.20 20:34, Tom Rini wrote:
On Wed, Apr 22, 2020 at 04:48:33PM +0200, Stefan Roese wrote:
Hi Tom,
please pull the 2nd batch of MVEBU related patches in this merge window. The major changes are:
Applied to u-boot/master, thanks!
But the following checkpatch should be fixed in a follow up sometime: WARNING: quoted string split across lines #28: FILE: cmd/mvebu/bubt.c:734:
printf("Error: A38x image meant to be "
"booted from \"%s\", not
"%s"!\n",
(There's another but I think the split is fine for how humans would grep for it).
Joel, will you please take care of this.
Thanks, Stefan

On 2020-04-22 23:04, Stefan Roese wrote:
On 22.04.20 20:34, Tom Rini wrote:
On Wed, Apr 22, 2020 at 04:48:33PM +0200, Stefan Roese wrote:
Hi Tom,
please pull the 2nd batch of MVEBU related patches in this merge window. The major changes are:
Applied to u-boot/master, thanks!
But the following checkpatch should be fixed in a follow up sometime: WARNING: quoted string split across lines #28: FILE: cmd/mvebu/bubt.c:734:
printf("Error: A38x image meant to be
"
"booted from \"%s\", not
"%s"!\n",
(There's another but I think the split is fine for how humans would grep for it).
Joel, will you please take care of this.
Thanks, Stefan
Yep, I'll get it updated today.
Joel
participants (3)
-
Joel Johnson
-
Stefan Roese
-
Tom Rini