From: Tom Rini <trini@konsulko.com>
Date: Tue, 23 Aug 2022 19:44:54 +0000 (-0400)
Subject: Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
X-Git-Url: http://git.dujemihanovic.xyz/img/%7B%7B%20%28.OutputFormats.Get?a=commitdiff_plain;h=aea087a665c447dfb89bf2113cad74ad53fa17a0;p=u-boot.git

Merge https://source.denx.de/u-boot/custodians/u-boot-marvell

- kirkwood: pogo_v4 & nsa310s: Add distro boot (Tony)
- kirkwood: add DM timer support and use it on lsxl boards (Michael)
- kirkwood: convert the Buffalo Linkstation LS-CHLv2 and XHL boards
  to DM (Michael)
- mvebu: turris_mox/omnia: misc improments (Pali)
- mvebu: mbus: Fix mbus driver to work also after U-Boot relocation (Pali)
---

aea087a665c447dfb89bf2113cad74ad53fa17a0
diff --cc configs/nsa310s_defconfig
index 8628ffcd9f,a5f01ef88e..5d8777ee76
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@@ -12,20 -15,17 +15,17 @@@ CONFIG_TARGET_NSA310S=
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xE0000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-nsa310s"
 +CONFIG_SYS_PROMPT="NSA310s> "
  CONFIG_IDENT_STRING="\nZyXEL NSA310S/320S 1/2-Bay Power Media Server"
  CONFIG_SYS_LOAD_ADDR=0x800000
+ CONFIG_DISTRO_DEFAULTS=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000
  CONFIG_BOOTDELAY=3
- CONFIG_USE_BOOTCOMMAND=y
- CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; ubifsload 0x700000 ${fdt}; ubifsumount; fdt addr 0x700000; fdt resize; fdt chosen; bootz 0x800000 - 0x700000"
  CONFIG_USE_PREBOOT=y
  # CONFIG_DISPLAY_BOARDINFO is not set
- CONFIG_HUSH_PARSER=y
 -CONFIG_SYS_PROMPT="NSA310s> "
  CONFIG_SYS_MAXARGS=32
  CONFIG_SYS_PBSIZE=1050
- CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_NAND=y
  CONFIG_CMD_SATA=y
diff --cc configs/pogo_v4_defconfig
index 01c42208a5,748842100e..f402ae67ff
--- a/configs/pogo_v4_defconfig
+++ b/configs/pogo_v4_defconfig
@@@ -11,22 -14,20 +14,20 @@@ CONFIG_TARGET_POGO_V4=
  CONFIG_ENV_SIZE=0x20000
  CONFIG_ENV_OFFSET=0xC0000
  CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogoplug-series-4"
 +CONFIG_SYS_PROMPT="Pogo_V4> "
  CONFIG_IDENT_STRING="\nPogoplug V4"
  CONFIG_SYS_LOAD_ADDR=0x800000
+ CONFIG_LTO=y
+ CONFIG_DISTRO_DEFAULTS=y
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000
  CONFIG_BOOTSTAGE=y
  CONFIG_SHOW_BOOT_PROGRESS=y
  CONFIG_BOOTDELAY=10
- CONFIG_USE_BOOTCOMMAND=y
- CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs_console}; run bootcmd_usb; bootm 0x00800000 0x01100000 0x2c00000"
  CONFIG_USE_PREBOOT=y
  CONFIG_BOARD_LATE_INIT=y
- CONFIG_HUSH_PARSER=y
 -CONFIG_SYS_PROMPT="Pogo_V4> "
  CONFIG_SYS_MAXARGS=32
  CONFIG_SYS_PBSIZE=1050
- CONFIG_CMD_BOOTZ=y
  # CONFIG_BOOTM_PLAN9 is not set
  # CONFIG_BOOTM_RTEMS is not set
  # CONFIG_BOOTM_VXWORKS is not set