From mboxrd@z Thu Jan  1 00:00:00 1970
From: Craig Setera <craigjunk@setera.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Updates to u-boot script for Raspberry Pi 4b devices
Date: Sun, 16 Jun 2024 10:28:39 -0500
Message-ID: <d18a71c1-d6d0-42ef-bff9-ed3f0eec883a@setera.org>
In-Reply-To: <218ec81b-731e-4c84-bfb7-bf11d1ad6cb8@setera.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5265424405118219621=="
List-Id: <development.lists.ipfire.org>

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

FWIW... I just used my updated u-boot script to update the image for 186=20
and went through the setup process using serial console for my Raspberry=20
Pi.=C2=A0 My process:

* Download backup from IPFire
* Flash new image to SD Card
* Update u-boot script
* Make new image using script
* Boot and do initial setup via serial console
* Login to web admin and restore backup

Even though this is a few more steps than just doing an "in place"=20
upgrade, I actually like that I am keeping the previous SD card and can=20
swap back if something goes wrong.

Craig

On 6/10/24 7:10 PM, Craig Setera wrote:
> Thanks. That was my original conversation! :-)=C2=A0 I will just wait for=20
> Arne to find some time.
>
> On 6/10/24 11:42 AM, Michael Tremer wrote:
>> Hello Craig,
>>
>> Hmm, I am not the right person to talk to about this, but it looks=20
>> this has all been discussed here already:
>>
>> https://community.ipfire.org/t/hang-with-kernel-starting-on-raspberry-pi/1=
1558
>>
>> -Michael
>>
>>> On 4 Jun 2024, at 13:40, Craig Setera <craigjunk(a)setera.org> wrote:
>>>
>>> Thanks Michael,
>>>
>>> Is there anything more you need me to do?=C2=A0 I assume most of the=20
>>> current effort is currently focused on the test release.
>>>
>>> Thanks,
>>> Craig
>>>
>>> On 5/23/24 12:01 PM, Michael Tremer wrote:
>>>> Hello Craig,
>>>>
>>>> Thank you very much for this patch. This is perfectly readable :)
>>>>
>>>> It looks logical to me, however I am not an expert when it comes to=20
>>>> SBCs, so I will leave this for Arne to review and merge.
>>>>
>>>> Best,
>>>> -Michael
>>>>
>>>>> On 20 May 2024, at 13:17, Craig Setera <craigjunk(a)setera.org> wrote:
>>>>>
>>>>> Updates to u-boot script for Raspberry Pi 4b devices to
>>>>> properly configure the serial console and to choose the proper=20
>>>>> boot address
>>>>> to be used on newer board revisions.=C2=A0 With these changes in place,=
=20
>>>>> I'm able
>>>>> to fully boot into a serial console in u-boot.
>>>>>
>>>>> The serial console configuration was derived from the Grub=20
>>>>> configuration,
>>>>> while the boot address changes were taken from the IPFire=20
>>>>> 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 tho=
se
>>>>> changes such that downloaded builds will work out of the box.
>>>>> https://community.ipfire.org/t/hang-with-kernel-starting-on-raspberry-p=
i/11558/37=20
>>>>>
>>>>>
>>>>> 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=A0 config/u-boot/boot.cmd | 27 ++++++++++++++++++++++++---
>>>>> =C2=A0 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
>>>>> =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 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=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=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=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=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=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=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=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=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=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=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 else
>>>>> @@ -95,11 +99,28 @@ else
>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 setenv ramdisk_addr -;
>>>>> =C2=A0 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=20
>>>>> "${fdtfile}" -eq "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_r=
evision}=20
>>>>> -eq 0xC03114 -o ${board_revision} -eq 0xD03114; then
>>>>> +=C2=A0=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_r=
evision}=20
>>>>> -eq 0xC03115 -o ${board_revision} -eq 0xD03115; then
>>>>> +=C2=A0=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=A0 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};
>>>>>
>>>>> =C2=A0 bootz ${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
>>>>>
>>>>>

--===============5265424405118219621==--