diff mbox series

board: phytec: phycore_imx8mp.env fix netboot issues

Message ID 20240322-phycore_mx8mp_netboot_fixes-v1-1-33d992343fc0@phytec.de
State Accepted
Commit 9d27e441bb14dd526c60c13d5ff16353ca322eb3
Delegated to: Fabio Estevam
Headers show
Series board: phytec: phycore_imx8mp.env fix netboot issues | expand

Commit Message

Yannic Moog March 22, 2024, 12:55 p.m. UTC
The "run netargs" command should come later in the "netboot" command
order when using dhcp since it sets the server and client ip addresses.
The previous order led to misconfigured kernel boot params and thus
kernel panic when serverip was not manually set.
Further, following Linux FHS 3.0, change the nfsroot default directory
to /srv/nfs.

Fixes: 60f64bec414e ("board: phytec: phycore_imx8mp: Add fec support")
Signed-off-by: Yannic Moog <y.moog@phytec.de>
---
Depends on [1] which is on next already.
[1] https://lore.kernel.org/u-boot/20240312085957.902398-1-l.anderweit@phytec.de/
---
 board/phytec/phycore_imx8mp/phycore_imx8mp.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


---
base-commit: 86b79cf131b64eadae023a127921893d30503093
change-id: 20240322-phycore_mx8mp_netboot_fixes-337ceb4ba0cc

Best regards,

Comments

Fabio Estevam March 24, 2024, 6:01 p.m. UTC | #1
On Fri, Mar 22, 2024 at 9:55 AM Yannic Moog <y.moog@phytec.de> wrote:
>
> The "run netargs" command should come later in the "netboot" command
> order when using dhcp since it sets the server and client ip addresses.
> The previous order led to misconfigured kernel boot params and thus
> kernel panic when serverip was not manually set.
> Further, following Linux FHS 3.0, change the nfsroot default directory
> to /srv/nfs.
>
> Fixes: 60f64bec414e ("board: phytec: phycore_imx8mp: Add fec support")
> Signed-off-by: Yannic Moog <y.moog@phytec.de>

Applied to u-boot-imx/next, thanks.
diff mbox series

Patch

diff --git a/board/phytec/phycore_imx8mp/phycore_imx8mp.env b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
index fae3e992654..7f6c5fd2c76 100644
--- a/board/phytec/phycore_imx8mp/phycore_imx8mp.env
+++ b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
@@ -46,17 +46,17 @@  netargs=
 	nfsroot=${serverip}:${nfsroot},v3,tcp
 netboot=
 	echo Booting from net ...;
-	run netargs;
 	if test ${ip_dyn} = yes; then
 		setenv get_cmd dhcp;
 	else
 		setenv get_cmd tftp;
 	fi;
 	${get_cmd} ${loadaddr} ${image};
+	run netargs;
 	if ${get_cmd} ${fdt_addr} ${fdt_file}; then
 		booti ${loadaddr} - ${fdt_addr};
 	else
 		echo WARN: Cannot load the DT;
 	fi;
-nfsroot=/nfs
+nfsroot=/srv/nfs
 sd_dev=1