From mboxrd@z Thu Jan  1 00:00:00 1970
From: Craig Setera <craigjunk@setera.org>
To: development@lists.ipfire.org
Subject: Re: Updates to u-boot script for Raspberry Pi 4b devices
Date: Fri, 17 May 2024 06:48:53 -0500
Message-ID: <199b13ed-14ee-462a-a264-40876f6b87b1@setera.org>
In-Reply-To: <5CF22B82-6B7F-47F3-A82A-43C0D2D7BB33@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9128940402389562275=="
List-Id: <development.lists.ipfire.org>

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

Thanks Michael

I will try to find time this weekend to try again.=C2=A0 I may have to see if=
=20
I can get this done outside of Thunderbird.

To make sure I'm understanding the issue.=C2=A0 It seems like the patch=20
contents are probably ok, but everything up to the contents of the patch=20
are smashed together?

Craig

On 5/17/24 4:27 AM, Michael Tremer wrote:
> Hello Craig,
>
> Thanks again for the patch. The tag in the subject line isn=E2=80=99t that =
important, but the email you sent has again removed all whitespace which make=
s it impossible to read or apply the patch.
>
> -Michael
>
>> On 16 May 2024, at 18:38, Craig Setera <craigjunk(a)setera.org> wrote:
>>
>> Apologies.  I just realized that I forgot to prefix the subject with [Patc=
h].  Should I resend with a new subject or can this be considered without tha=
t step?
>>
>> On 5/15/24 7:17 PM, Craig Setera wrote:
>>> Updates to u-boot script for Raspberry Pi 4b devices to
>>> properly configure the serial console and to choose the proper boot addre=
ss
>>> to be used on newer board revisions. With these changes in place, I'm abl=
emay
>>> 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. 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/=
11558/37
>>> NOTE: The use of the different parameter options to the test
>>> command to minimize the need for deeply nested conditionals. 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>
>>> ---
>>> config/u-boot/boot.cmd | 27 ++++++++++++++++++++++++---
>>> 1 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
>>> if test "${fdtfile}" =3D "broadcom/bcm2837-rpi-3-b.dtb"; then
>>> setenv console ttyS1,115200n8;
>>> else
>>> -setenv console ttyAMA0,115200n8;
>>> +if test "${fdtfile}" =3D "broadcom/bcm2711-rpi-4-b.dtb"; then
>>> +setenv console ttyS0,115200n8;
>>> +else
>>> +setenv console ttyAMA0,115200n8;
>>> +fi;
>>> fi;
>>> fi;
>>> else
>>> @@-95,11 +99,28 @@else
>>> setenv ramdisk_addr -;
>>> fi;
>>> +#
>>> +# 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 "=
broadcom/bcm2711-rpi-4-b.dtb"; then
>>> +# Hardware revision 1.4
>>> +if test ${board_revision} -eq 0xB03114 -o ${board_revision} -eq 0xC03114=
 -o ${board_revision} -eq 0xD03114; then
>>> +setenv booti_fdt_addr ${fdt_addr};
>>> +fi
>>> +
>>> +# Hardware revision 1.5
>>> +if test ${board_revision} -eq 0xB03115 -o ${board_revision} -eq 0xC03115=
 -o ${board_revision} -eq 0xD03115; then
>>> +setenv booti_fdt_addr ${fdt_addr};
>>> +fi
>>> +fi;
>>> +
>>> bootz ${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};
>>> bootz ${kernel_addr_r} - ${fdt_addr_r};
>>> -booti ${kernel_addr_r} - ${fdt_addr_r};
>>> +booti ${kernel_addr_r} - ${booti_fdt_addr};
>>> # Recompile with:
>>> # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

--===============9128940402389562275==--