From: Nathan Morrisson <nmorrisson@phytec.com>
Date: Wed, 29 Jan 2025 10:34:44 +0000 (-0800)
Subject: include: env: phytec: Add optargs to K3 files
X-Git-Tag: v2025.04-rc2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27d0af5e857706b5b7bfed5b43ac3ed418a4e56f;p=pandora-u-boot.git

include: env: phytec: Add optargs to K3 files

Add the optargs variable so that we can set optional arguments while
booting.

Signed-off-by: Nathan Morrisson <nmorrisson@phytec.com>
Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
---

diff --git a/include/env/phytec/k3_mmc.env b/include/env/phytec/k3_mmc.env
index ad8d3a8b764..3f67e312f65 100644
--- a/include/env/phytec/k3_mmc.env
+++ b/include/env/phytec/k3_mmc.env
@@ -11,6 +11,7 @@
 
 mmcargs=setenv bootargs console=${console} earlycon=${earlycon}
 	root=/dev/mmcblk${mmcdev}p${mmcroot} ${raucargs} rootwait rw
+	${optargs}
 mmcloadimage=load mmc ${mmcdev}:${mmcpart} ${kernel_addr_r} Image
 mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}
 mmcboot=if test ${doraucboot} = 1; then run raucinit; fi;
diff --git a/include/env/phytec/k3_net.env b/include/env/phytec/k3_net.env
index 377e406688d..8ad1cb7b0c2 100644
--- a/include/env/phytec/k3_net.env
+++ b/include/env/phytec/k3_net.env
@@ -9,7 +9,7 @@
 #include <env/phytec/overlays.env>
 
 netargs=setenv bootargs console=${console} root=/dev/nfs ip=dhcp rw
-	nfsroot=${serverip}:${nfsroot},vers=4,tcp
+	nfsroot=${serverip}:${nfsroot},vers=4,tcp ${optargs}
 netloadimage=${net_fetch_cmd} ${kernel_addr_r} ${serverip}:/Image
 netloadfdt=${net_fetch_cmd} ${fdt_addr_r} ${serverip}:/${fdtfile}
 netboot=run netargs;
diff --git a/include/env/phytec/k3_spi.env b/include/env/phytec/k3_spi.env
index 97d3a157058..8e9cfce3b4c 100644
--- a/include/env/phytec/k3_spi.env
+++ b/include/env/phytec/k3_spi.env
@@ -6,7 +6,7 @@
 
 /* Logic for TI K3 based SoCs to boot from an OSPI/QSPI NOR flash. */
 
-spiargs=setenv bootargs console=${console} earlycon=${earlycon}
+spiargs=setenv bootargs console=${console} earlycon=${earlycon} ${optargs}
 spiloadimage=sf read ${kernel_addr_r} ${spi_image_addr} ${size_kern}
 spiloadfdt=sf read ${fdt_addr_r} ${spi_fdt_addr} ${size_fdt}
 spiloadramdisk=sf read ${ramdisk_addr_r} ${spi_ramdisk_addr} ${size_fs}