uboot: init (firmwareOdroidC2/C4, ubootOdroidC4) Hardkernel's Odroid C4 and Odroid C2 board support, drop Armbian dependency #101454

arapov · 2020-10-23T11:01:58Z

Motivation for this change

This enables Odroid C4 board in NixOS with Linux kernel version 5.8+.
Also retires dependency on 3rd-party repository from Armbian.

Things done

arapov · 2020-10-23T12:26:10Z

fyi, booting from eMMC on OdroidC2 is failing for me in u-boot v2020.07 and v2020.10. Though works flawlessly in v2020.04. I am triaging it and working on a fix right now.

arapov · 2020-10-23T13:20:20Z

fyi, booting from eMMC on OdroidC2 is failing for me in u-boot v2020.07 and v2020.10. Though works flawlessly in v2020.04. I am triaging it and working on a fix right now.

this is the commit which breaks eMMC for OdroidC2:
https://gitlab.denx.de/u-boot/u-boot/-/commit/dd5f2351e99aad8fcbedbc1305b8b51b09952336

looking into...

arapov · 2020-10-23T15:28:08Z

fyi, booting from eMMC on OdroidC2 is failing for me in u-boot v2020.07 and v2020.10. Though works flawlessly in v2020.04. I am triaging it and working on a fix right now.

this is the commit which breaks eMMC for OdroidC2:
https://gitlab.denx.de/u-boot/u-boot/-/commit/dd5f2351e99aad8fcbedbc1305b8b51b09952336

looking into...

This is the line from the patch that breaks eMMC:
https://gitlab.denx.de/u-boot/u-boot/-/blob/master/arch/arm/dts/meson-gxbb.dtsi#L411

I will send out patch to respective upstreams.

pkgs/misc/uboot/default.nix

pkgs/misc/uboot/hardkernel-firmware.nix

pkgs/misc/uboot/default.nix

arapov · 2020-10-27T08:48:26Z

FYI, discussion for the possible eMMC fix: https://groups.io/g/u-boot-amlogic/topic/meson_gxbb_regression_since/77816805
@lopsided98, thanks for comments, I should have a time next week to address all the notes.

pkgs/misc/uboot/default.nix

arapov · 2020-11-14T12:29:27Z

~~I decided to keep the odroid-c4 hack in git history, so that it is more clear what has actually happened in mmc driver for gx/sm1 boards.~~

pkgs/misc/uboot/default.nix

arapov · 2020-12-16T06:59:21Z

All the initial hacks were fixed and fixes are cherry-picked. Fixes are in staging for 2021.01 release.

sbruder

After changing the u-boot source hash (see inline comment) and erasing petitboot from the SPI flash as described here, this successfully booted on my Odroid HC4 (compatible with Odroid C4).

Thank you!

pkgs/misc/uboot/hardkernel-firmware.nix

arapov · 2021-02-05T15:16:43Z

@lopsided98, could you check this patchset please. I will be happy to see this merged eventually. :-)

lopsided98

I successfully tested this with my ODROID-C2. This looks good except for the two suggestions.

pkgs/misc/uboot/hardkernel-firmware.nix

pkgs/misc/uboot/default.nix

arapov · 2021-02-09T10:58:14Z

@lopsided98, thanks for the ACK. Could you point me to a document that describes the process of getting this code merged? Or explain it here briefly. I am new to nixos development model, need to close some gaps.

ssia Signed-off-by: Anton Arapov <anton@deadbeef.mx>

This patch brings Hardkernel Odroid C2 and Odroid C4 firmware. - https://wiki.odroid.com/odroid-c2/software/building_u-boot - https://wiki.odroid.com/odroid-c4/software/building_u-boot Signed-off-by: Anton Arapov <anton@deadbeef.mx>

Odroid C4: Cortex-A55 CPU, Mali-G31 GPU. More data: https://wiki.odroid.com/odroid-c4/ Signed-off-by: Anton Arapov <anton@deadbeef.mx>

Retire dependency on Armbian provided board blobs. Use official hardkernel's ones instead. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

u-boot 2021.01 was released, required patches to run hardkernel's boards are no longer needed as they made the release. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

This solves repo pinpointing to particular commit number, thus prevents failing builds when the repos are updated. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

an open alternative to aml_encrypt_g12a and aml_encrypt_g12b. Proprietary tool is not available for aarch64 architecture, which is a show stopper for building u-boot images for the boards like Odroid C4. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

This makes aarch64 builds possible. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

as per review request Signed-off-by: Anton Arapov <anton@deadbeef.mx>

postPatch should be used because prePatch breaks patches put in patches. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

…] instead https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

arapov · 2021-04-13T10:20:38Z

@samueldr , yeah I will give your branch a test and soaking time. thanks!

samueldr · 2021-04-13T21:55:43Z

I force-pushed the minor fixes to the branch. For transparency, one of the builder functions didn't install the README.md file, and I ended up not deleting the python and sh helpers from the firmware files, as they do things not done with the other tools.

https://github.com/samueldr/nixpkgs/commits/PR101454

I also opened #119371 which will build on top of those changes.

I am inclined to think the changes are correct and desirable in Nixpkgs. I would simply append those commits on this PR, without squashing anything currently observable. The whole trail is AFAIK buildable. At least for my changes. It clearly shows how it went from the original builds to the final builds.

Any other U-Boot maintainers (e.g. @lopsided98) have opinions here?

Note that it is my understanding that we probably won't really be able to replace those early init blob ever. Though BL31 may, at some point, we'll see.

arapov · 2021-04-14T10:37:32Z

@samueldr, ssd in my laptop has died. waiting for a replacement, till then I'm not able to build/test the u-boot images.
I tried to build it on my Mac and it fails, and I'm not sure I want to look into it. :-)

erdnaxe · 2021-08-10T16:55:52Z

I am able to boot my Odroid HC4 with this PR, it works perfectly!

My Odroid HC4 is now running NixOS 21.05 using https://github.com/NixOS/nixpkgs/blob/nixos-21.05/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix and I removed Petitboot (instructions on https://www.armbian.com/odroid-hc4/).

Patagonicus · 2021-09-04T07:41:25Z

Can confirm that this works on the HC4. For anyone trying to reproduce this:

Flash https://hydra.nixos.org/build/151751284 to an sdcard.
Check out this pull request, currently at 7cf5a0e, nix-build . -A pkgsCross.aarch64-multiplatform.ubootOdroidC4, then ./result/sd_fusing.sh $SDCARDDEV.
Hold down the button on the underside of the HC4 while you plug in the power, which will bypass the petitboot boot loader in the SPI flash and instead load the u-boot from the Micro-SD card.

Once you've confirmed that NixOS boots successfully and you won't need Ubuntu anymore, you can also erase petitboot, which remove the need for pressing the button, see https://nixos.wiki/wiki/NixOS_on_ARM/ODROID-HC4#Petitboot_removal.

Unfortunately with that image I don't get any output on HDMI or UART, but I was able to use the Hardkernel Ubuntu image to rebuild the image with a password for nixos set, which allowed SSH login: check out 8a2ec31, modify nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix to set the password, then build via nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-installer.nix -A config.system.build.sdImage.

Currently trying to see if the Hardkernel kernel will make HDMI and/or UART work. Basing my kernel package off of https://github.com/considerate/nixos-odroidhc4/tree/983c146bc7d1d05594e04f99e808b0a661ed80bd/overlays/kernel for that. That should also hopefully make SATA work (didn't test it with a drive, but at least dmesg and lspci do not show anything with mainline kernel; https://nixos.wiki/wiki/NixOS_on_ARM/ODROID-HC4 also notes that SATA is not working).

erdnaxe · 2021-09-04T07:59:30Z

Unfortunately with that image I don't get any output on HDMI

In my case I was able to get HDMI working with a standard 1080p screen, following your method.

SATA is not working on my side (lspci output is empty).

considerate · 2022-06-25T18:51:42Z

SATA is not working on my side (lspci output is empty).

SATA works for me if I update to a more recent version of uboot and use the odroid-hc4_defconfig file which includes SCSI=y and SATA=y.

https://github.com/u-boot/u-boot/blob/v2022.04/configs/odroid-hc4_defconfig

dnr · 2022-07-03T15:45:31Z

Another report: this works great on my HC4. Thanks to everyone who worked on this.

I built u-boot with the instructions here, which refer to samueldr's repo, but it looks like it's the same code rebased.

Using nixos 22.05 with stock kernel, currently 5.15.49. SATA works. I have not verified HDMI or UART.

considerate · 2022-07-03T16:04:23Z

I have not verified HDMI or UART.

I have verified that both HDMI and UART works. I'm using the configuration here https://github.com/considerate/nixos-odroidhc4/tree/0c1716bf1d8c7f99ba6ad0334e81240afdc27cbf which is based on this PR.

sorki · 2023-10-20T10:20:40Z

There's some overlap with #245100 that has no merge conflicts currently. So maybe we can get that in and update this one.

arapov · 2023-10-20T11:18:07Z

There's some overlap with #245100 that has no merge conflicts currently. So maybe we can get that in and update this one.

I was under impression that this patch is "no-go" because of the https://github.com/Tow-Boot/Tow-Boot project. @samueldr ?

In case it is not true - I can update this PR.

lopsided98 · 2023-10-21T17:51:28Z

I don't think Tow-Boot should have any impact on U-Boot packaging in nixpkgs. Was this discussed somewhere?

Binary blobs are never nice, but we already support the ODROID-C2, and the C4 is basically the same. This PR also gets rid of some of the existing C2 blobs.

My only suggestion after reading through this PR again is that perhaps the package attributes should be firmware-odroid-c2/c4. Our U-Boot packages use camel case, and I'm guilty of copying it with armTrustedFirmware, but this is not the standard convention in nixpkgs.

ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 23, 2020

ofborg bot requested review from lopsided98, dezgeg and samueldr October 23, 2020 11:12

ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-linux: 1 10.rebuild-linux: 1-10 labels Oct 23, 2020

lopsided98 suggested changes Oct 23, 2020

View reviewed changes

ofborg bot requested a review from lopsided98 November 13, 2020 16:50

ofborg bot added 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 13, 2020

samueldr reviewed Nov 14, 2020

View reviewed changes

pkgs/misc/uboot/default.nix Outdated Show resolved Hide resolved

ofborg bot requested a review from samueldr November 14, 2020 11:05

lopsided98 suggested changes Nov 22, 2020

View reviewed changes

pkgs/misc/uboot/default.nix Outdated Show resolved Hide resolved

arapov changed the title ~~RFC: uboot: init Hardkernel Odroid C4 board and drop Armbian deps for Odroid C2 board~~ uboot: init (firmwareOdroidC2/C4, ubootOdroidC4) Hardkernel's Odroid C4 board support, drop Armbian dependency Dec 15, 2020

sbruder suggested changes Jan 6, 2021

View reviewed changes

pkgs/misc/uboot/hardkernel-firmware.nix Outdated Show resolved Hide resolved

lopsided98 suggested changes Feb 5, 2021

View reviewed changes

pkgs/misc/uboot/hardkernel-firmware.nix Outdated Show resolved Hide resolved

pkgs/misc/uboot/default.nix Outdated Show resolved Hide resolved

lopsided98 approved these changes Feb 9, 2021

View reviewed changes

arapov added 11 commits April 13, 2021 11:34

maintainers: add aarapov

85f95e3

ssia Signed-off-by: Anton Arapov <anton@deadbeef.mx>

uboot: init (ubootOdroidC4) Hardkernel's Odroid C4 board support

b16b71e

Odroid C4: Cortex-A55 CPU, Mali-G31 GPU. More data: https://wiki.odroid.com/odroid-c4/ Signed-off-by: Anton Arapov <anton@deadbeef.mx>

uboot: (ubootOdroidC2) retire Armbian dependency

7a36dcb

Retire dependency on Armbian provided board blobs. Use official hardkernel's ones instead. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

uboot: (firmwareOdroidC2/C4) drop patches for 2021.01

c4294ff

u-boot 2021.01 was released, required patches to run hardkernel's boards are no longer needed as they made the release. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

uboot: (firmwareOdroidC2/C4) switch fetchgit to fetchFromGitHub

65ac463

This solves repo pinpointing to particular commit number, thus prevents failing builds when the repos are updated. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

meson64-tools: init

fe7cb7e

an open alternative to aml_encrypt_g12a and aml_encrypt_g12b. Proprietary tool is not available for aarch64 architecture, which is a show stopper for building u-boot images for the boards like Odroid C4. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

uboot: (ubootOdroidC4) use meson64-tools instead of aml_encrypt_g12a

e219927

This makes aarch64 builds possible. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

uboot: (firmwareOdroidC2/C4) oneline and sort list of files to install

b38ab55

as per review request Signed-off-by: Anton Arapov <anton@deadbeef.mx>

uboot: (firmwareOdroidC2/C4) use postPatch instead of prePatch

10799d0

postPatch should be used because prePatch breaks patches put in patches. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = […

7cf5a0e

…] instead https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>

samueldr mentioned this pull request Apr 13, 2021

uboot: Init ubootLibretechAC, using buildUBootMesonGXL #119371

Closed

10 tasks

Artturin added the 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people label Apr 13, 2022

bobby285271 removed the 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people label Jun 26, 2022

dnr mentioned this pull request Jul 3, 2022

Use a more recent kernel considerate/nixos-odroidhc4#2

Closed

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 7, 2023

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 20, 2023

arapov closed this by deleting the head repository Dec 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

uboot: init (firmwareOdroidC2/C4, ubootOdroidC4) Hardkernel's Odroid C4 and Odroid C2 board support, drop Armbian dependency #101454

uboot: init (firmwareOdroidC2/C4, ubootOdroidC4) Hardkernel's Odroid C4 and Odroid C2 board support, drop Armbian dependency #101454

arapov commented Oct 23, 2020 •

edited

Loading

arapov commented Oct 23, 2020

arapov commented Oct 23, 2020

arapov commented Oct 23, 2020

arapov commented Oct 27, 2020

arapov commented Nov 14, 2020 •

edited

Loading

arapov commented Dec 16, 2020

sbruder left a comment

arapov commented Feb 5, 2021

lopsided98 left a comment •

edited

Loading

arapov commented Feb 9, 2021

arapov commented Apr 13, 2021

samueldr commented Apr 13, 2021 •

edited

Loading

arapov commented Apr 14, 2021

erdnaxe commented Aug 10, 2021 •

edited

Loading

Patagonicus commented Sep 4, 2021

erdnaxe commented Sep 4, 2021

considerate commented Jun 25, 2022

dnr commented Jul 3, 2022

considerate commented Jul 3, 2022

sorki commented Oct 20, 2023

arapov commented Oct 20, 2023 •

edited

Loading

lopsided98 commented Oct 21, 2023

uboot: init (firmwareOdroidC2/C4, ubootOdroidC4) Hardkernel's Odroid C4 and Odroid C2 board support, drop Armbian dependency #101454

uboot: init (firmwareOdroidC2/C4, ubootOdroidC4) Hardkernel's Odroid C4 and Odroid C2 board support, drop Armbian dependency #101454

Conversation

arapov commented Oct 23, 2020 • edited Loading

Motivation for this change

Things done

arapov commented Oct 23, 2020

arapov commented Oct 23, 2020

arapov commented Oct 23, 2020

arapov commented Oct 27, 2020

arapov commented Nov 14, 2020 • edited Loading

arapov commented Dec 16, 2020

sbruder left a comment

Choose a reason for hiding this comment

arapov commented Feb 5, 2021

lopsided98 left a comment • edited Loading

Choose a reason for hiding this comment

arapov commented Feb 9, 2021

arapov commented Apr 13, 2021

samueldr commented Apr 13, 2021 • edited Loading

arapov commented Apr 14, 2021

erdnaxe commented Aug 10, 2021 • edited Loading

Patagonicus commented Sep 4, 2021

erdnaxe commented Sep 4, 2021

considerate commented Jun 25, 2022

dnr commented Jul 3, 2022

considerate commented Jul 3, 2022

sorki commented Oct 20, 2023

arapov commented Oct 20, 2023 • edited Loading

lopsided98 commented Oct 21, 2023

arapov commented Oct 23, 2020 •

edited

Loading

arapov commented Nov 14, 2020 •

edited

Loading

lopsided98 left a comment •

edited

Loading

samueldr commented Apr 13, 2021 •

edited

Loading

erdnaxe commented Aug 10, 2021 •

edited

Loading

arapov commented Oct 20, 2023 •

edited

Loading