From mboxrd@z Thu Jan  1 00:00:00 1970
From: Craig Setera <craigjunk@setera.org>
To: development@lists.ipfire.org
Subject: [PATCH] Updates to u-boot script for Raspberry Pi 4b devices
Date: Mon, 20 May 2024 07:17:54 -0500
Message-ID: <ccbdf33c-440e-4a85-8d92-f1be75380464@setera.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0442464610153439150=="
List-Id: <development.lists.ipfire.org>

--===============0442464610153439150==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Updates to u-boot script for Raspberry Pi 4b devices to
properly configure the serial console and to choose the proper boot address
to be used on newer board revisions.=C2=A0 With these changes in place, I'm a=
ble
to fully boot into a serial console in u-boot.

The serial console configuration was derived from the Grub configuration,
while the boot address changes were taken from the IPFire Raspberry 4b
documentation page: https://www.ipfire.org/docs/hardware/arm/rpi/four

Per the conversation in the forums, I don't know why the boot
address changes are required.=C2=A0 I was simply trying to automate those
changes such that downloaded builds will work out of the box.
https://community.ipfire.org/t/hang-with-kernel-starting-on-raspberry-pi/1155=
8/37

NOTE: The use of the different parameter options to the test
command to minimize the need for deeply nested conditionals.=C2=A0 I did
try more bash-shell like syntax, but u-boot didn't seem to like that.
The operators used here were found in the u-boot source.

Tested-by: Craig Setera <craigjunk(a)setera.org>
Signed-off-by: Craig Setera <craigjunk(a)setera.org>
---
 =C2=A0config/u-boot/boot.cmd | 27 ++++++++++++++++++++++++---
 =C2=A01 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index a27996780..eedd5776d 100644
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -51,7 +51,11 @@ if test "${SERIAL-CONSOLE}" =3D "ON"; then
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 =C2=A0=C2=A0=C2=A0 if test "${fdtfile}" =3D=20
"broadcom/bcm2837-rpi-3-b.dtb"; then
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 setenv console ttyS1,115200n8;
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 =C2=A0=C2=A0=C2=A0 else
-=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =
=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 setenv console ttyAMA0,115200n8;
+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =
=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 if test "${fdtfile}" =3D=20
"broadcom/bcm2711-rpi-4-b.dtb"; then
+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =
=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 setenv console ttyS0=
,115200n8;
+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =
=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 else
+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =
=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 setenv console ttyAM=
A0,115200n8;
+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =
=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 fi;
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 =C2=A0=C2=A0=C2=A0 fi;
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 fi;
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 else
@@ -95,11 +99,28 @@ else
 =C2=A0=C2=A0=C2=A0=C2=A0 setenv ramdisk_addr -;
 =C2=A0fi;

+#
+# Handle Raspberry Pi 4 address differences
+# https://www.ipfire.org/docs/hardware/arm/rpi/four
+#
+setenv booti_fdt_addr ${fdt_addr_r};
+if test "${board}" -eq "rpi" -a ${cpu} -eq "armv8" -a "${fdtfile}" -eq=20
"broadcom/bcm2711-rpi-4-b.dtb"; then
+=C2=A0=C2=A0=C2=A0 # Hardware revision 1.4
+=C2=A0=C2=A0=C2=A0 if test ${board_revision} -eq 0xB03114 -o ${board_revisio=
n} -eq=20
0xC03114 -o ${board_revision} -eq 0xD03114; then
+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 setenv booti_fdt_addr ${fdt_addr};
+=C2=A0=C2=A0=C2=A0 fi
+
+=C2=A0=C2=A0=C2=A0 # Hardware revision 1.5
+=C2=A0=C2=A0=C2=A0 if test ${board_revision} -eq 0xB03115 -o ${board_revisio=
n} -eq=20
0xC03115 -o ${board_revision} -eq 0xD03115; then
+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 setenv booti_fdt_addr ${fdt_addr};
+=C2=A0=C2=A0=C2=A0 fi
+fi;
+
 =C2=A0bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
-booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
+booti ${kernel_addr_r} ${ramdisk_addr} ${booti_fdt_addr};

 =C2=A0bootz ${kernel_addr_r} - ${fdt_addr_r};
-booti ${kernel_addr_r} - ${fdt_addr_r};
+booti ${kernel_addr_r} - ${booti_fdt_addr};

 =C2=A0# Recompile with:
 =C2=A0# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
--=20
2.40.1



--===============0442464610153439150==--