]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge patch series "phycore-am62/4: Add more boot sources"
authorTom Rini <trini@konsulko.com>
Tue, 10 Sep 2024 19:16:59 +0000 (13:16 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 10 Sep 2024 20:56:12 +0000 (14:56 -0600)
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.

1  2 
board/phytec/phycore_am62x/MAINTAINERS
configs/phycore_am62x_a53_defconfig
configs/phycore_am62x_r5_usbdfu_defconfig
configs/phycore_am64x_a53_defconfig

index 42463ad054ef22601b91739d922449c0e2f13f48,42463ad054ef22601b91739d922449c0e2f13f48..670c74734814e36e74a72f238682aaa61f05d2ea
@@@ -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
Simple merge
index 0000000000000000000000000000000000000000,1c05950dddf5a1d3adb67d674615dbb5da2959a9..ff17a29e1a736feff95b00e96306eaa3e9cdbeb6
mode 000000,100644..100644
--- /dev/null
@@@ -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"
Simple merge