From: Tom Rini <trini@konsulko.com>
Date: Tue, 10 Sep 2024 19:16:59 +0000 (-0600)
Subject: Merge patch series "phycore-am62/4: Add more boot sources"
X-Git-Tag: v2025.01-rc5-pxa1908~170^2~53
X-Git-Url: http://git.dujemihanovic.xyz/html/static/%7B%7B%20.RelPermalink%20%7D%7D?a=commitdiff_plain;h=78d898eec080b02059c8dc09318b8761044fea85;p=u-boot.git

Merge patch series "phycore-am62/4: Add more boot sources"

Daniel Schultz <d.schultz@phytec.de> says:

This patch stack extends the phyCORE-AM62x/AM64x U-Boot by following boot
sources:

  - Load U-Boot with USB DFU
  - Load a Linux and initramfs from OSPI/QSPI NOR flash
  - Load a Linux and rootfs from Network

Moreover, it adds required changes to the environment to boot an A/B
system with RAUC and includes some minor fixes.
---

78d898eec080b02059c8dc09318b8761044fea85
diff --cc board/phytec/phycore_am62x/MAINTAINERS
index 42463ad054,42463ad054..670c747348
--- a/board/phytec/phycore_am62x/MAINTAINERS
+++ b/board/phytec/phycore_am62x/MAINTAINERS
@@@ -9,6 -9,6 +9,7 @@@ F:	arch/arm/dts/k3-am625-r5-phycore-som
  F:	board/phytec/phycore_am62x/
  F:	configs/phycore_am62x_a53_defconfig
  F:	configs/phycore_am62x_r5_defconfig
++F:	configs/phycore_am62x_r5_usbdfu_defconfig
  F:	include/configs/phycore_am62x.h
  F:	doc/board/phytec/phycore-am62x.rst
  F:	board/phytec/common/k3
diff --cc configs/phycore_am62x_r5_usbdfu_defconfig
index 0000000000,1c05950ddd..ff17a29e1a
mode 000000,100644..100644
--- a/configs/phycore_am62x_r5_usbdfu_defconfig
+++ b/configs/phycore_am62x_r5_usbdfu_defconfig
@@@ -1,0 -1,3 +1,9 @@@
+ #include <configs/phycore_am62x_r5_defconfig>
+ #include <configs/am62x_r5_usbdfu.config>
++
++CONFIG_ARM=y
++CONFIG_ARCH_K3=y
++CONFIG_SOC_K3_AM625=y
++CONFIG_TARGET_PHYCORE_AM62X_R5=y
++
+ CONFIG_USB_GADGET_MANUFACTURER="PHYTEC"