uboot: add RockPro64 support, fix Rock64 build, misc related changes #53170

lopsided98 · 2019-01-02T03:34:30Z

Motivation for this change

This PR started as an attempt to add RockPro64 support to U-Boot in Nix, but a bunch of other related changes accumulated along the way.

Things done

Add rkdeveloptool package. This is a tool for communicating with Rockchip devices over their USB OTG port, allowing flashing the eMMC/SD and SPI flash.
Upgrade ARM trusted firmware from 1.5 to 2.0. This works correctly in the Rock64 U-Boot.
Add RK3399 support to ATF. This was supposed to be for the RockPro64, but it caused U-Boot to hang in the SPL.
Add libfdt Python package. This is just toPythonModule dtc.
Add RockPro64 U-Boot support. This uses a downstream version of 2017.09 (maintained by ayufan), which is the best supported U-Boot tree for this board. This uses a binary blob for ATF as well as the TPL.
Fix Rock64 U-Boot build. This switches from ayufan's mainline-master branch to rockchip-master, which is better maintained (even though it is older). This is the same branch I use for the RockPro64. I attempted to get rid of the TPL blob, but using U-Boot's TPL causes the board to hang after a few minutes (previously it would not even finish booting before hanging).

I got rid of the pythonpath patch in U-Boot, because I could not see why it was necessary and it was annoying to have to maintain a separate backport for 2017.09. Most builds don't use any Python libraries, so the PYTHONPATH doesn't matter. The Rock64 build requires libfdt, but the patch didn't seem to fix the build, I had to use withPackages.

pkgs/misc/rkdeveloptool/default.nix

lopsided98 · 2019-01-05T04:10:15Z

cc @dezgeg

pkgs/misc/arm-trusted-firmware/default.nix

Missed something

FRidh

Python part (and generally overall) looks good to me.

pkgs/misc/uboot/rockpro64.nix

Mic92 · 2019-01-05T11:32:45Z

cc @thefloweringash

Mic92 · 2019-01-17T12:48:27Z

I also would have the hardware for testing. Did you use the mainline kernel or the rock64 one?

lopsided98 · 2019-01-18T03:27:41Z

I wasn't able to get mainline 4.20 to boot on the RockPro64, but I didn't try that hard. I was able to get mainline to boot on the Rock64 a while ago but had lots of problems with ethernet and USB. Currently, I use a custom version of ayufan's linux-mainline-kernel rebased against the latest mainline stable branch. ayufan's linux-mainline-kernel or linux-kernel should both work fine, except I wasn't able to get the latter to compile last time I tried.

lopsided98 · 2019-01-18T03:47:47Z

It turns out that the dtc update from 1.4.5 to 1.4.7 broke the build of U-Boot 2017.09, and I can't see an easy fix for it. I will probably end up adding an override to pin dtc to 1.4.5 for the Rock{Pro,}64 U-Boot builds, but for now I just added a revert for that commit in case anyone wants to test this PR.

Here is the error in case anyone has an idea of how to fix it:

In file included from ./tools/../lib/libfdt/libfdt.h:10:0,
                 from tools/../include/libfdt.h:1,
                 from tools/fdt_host.h:11,
                 from tools/imagetool.h:24,
                 from tools/aisimage.c:8:
/nix/store/yyfzjvpk0ij1ixb5hlaznin54sw2awpz-dtc-1.4.7/include/libfdt_env.h:71:30: error: conflicting types for 'fdt64_t'
 typedef uint64_t FDT_BITWISE fdt64_t;
                              ^~~~~~~
In file included from <command-line>:0:0:
././include/libfdt_env.h:19:16: note: previous declaration of 'fdt64_t' was here
 typedef __be64 fdt64_t;
                ^~~~~~~
In file included from ././include/libfdt_env.h:12:0,
                 from <command-line>:0:
/nix/store/yyfzjvpk0ij1ixb5hlaznin54sw2awpz-dtc-1.4.7/include/libfdt_env.h:91:24: error: expected ')' before 'x'
 static inline uint32_t fdt32_to_cpu(fdt32_t x)
                        ^
././include/compiler.h:71:9: error: expected ')' before '&' token
  ((((x) & 0xff000000) >> 24) | \
         ^
././include/compiler.h:71:23: error: expected ')' before '>>' token
  ((((x) & 0xff000000) >> 24) | \
                       ^
././include/compiler.h:71:30: error: expected ')' before '|' token
  ((((x) & 0xff000000) >> 24) | \
                              ^
/nix/store/yyfzjvpk0ij1ixb5hlaznin54sw2awpz-dtc-1.4.7/include/libfdt_env.h:95:23: error: expected ')' before 'x'
 static inline fdt32_t cpu_to_fdt32(uint32_t x)
                       ^
././include/compiler.h:71:9: error: expected ')' before '&' token
  ((((x) & 0xff000000) >> 24) | \
         ^
././include/compiler.h:71:23: error: expected ')' before '>>' token
  ((((x) & 0xff000000) >> 24) | \
                       ^
././include/compiler.h:71:30: error: expected ')' before '|' token
  ((((x) & 0xff000000) >> 24) | \
                              ^
/nix/store/yyfzjvpk0ij1ixb5hlaznin54sw2awpz-dtc-1.4.7/include/libfdt_env.h:100:24: error: expected ')' before 'x'
 static inline uint64_t fdt64_to_cpu(fdt64_t x)
                        ^
././include/compiler.h:76:9: error: expected ')' before '&' token
  ((((x) & 0xff00000000000000##sfx) >> 56) | \
         ^
././include/compiler.h:76:36: error: expected ')' before '>>' token
  ((((x) & 0xff00000000000000##sfx) >> 56) | \
                                    ^
././include/compiler.h:76:43: error: expected ')' before '|' token
  ((((x) & 0xff00000000000000##sfx) >> 56) | \
                                           ^
/nix/store/yyfzjvpk0ij1ixb5hlaznin54sw2awpz-dtc-1.4.7/include/libfdt_env.h:104:23: error: expected ')' before 'x'
 static inline fdt64_t cpu_to_fdt64(uint64_t x)
                       ^
././include/compiler.h:76:9: error: expected ')' before '&' token
  ((((x) & 0xff00000000000000##sfx) >> 56) | \
         ^
././include/compiler.h:76:36: error: expected ')' before '>>' token
  ((((x) & 0xff00000000000000##sfx) >> 56) | \
                                    ^
././include/compiler.h:76:43: error: expected ')' before '|' token
  ((((x) & 0xff00000000000000##sfx) >> 56) | \
                                           ^
make[1]: *** [scripts/Makefile.host:116: tools/aisimage.o] Error 1
make: *** [Makefile:1278: tools] Error 2

Mic92 · 2019-01-18T11:22:27Z

@lopsided98 do you have some nixos configuration, I could use to deploy this?

lopsided98 · 2019-01-18T17:36:23Z

@Mic92 I just dd it to the card manually. idbloader.img needs to be placed at sector 64. I usually add a partition that starts at sector 64 to make updating less error prone, but this is not necessary.

My disk layout looks like this:

Disk /dev/mmcblk1: 29.1 GiB, 31268536320 bytes, 61071360 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: gpt
Disk identifier: 8BCF5A28-7359-4B24-922B-4593E27C33FE

Device         Start      End  Sectors  Size Type
/dev/mmcblk1p1    64     8063     8000  3.9M Linux filesystem
/dev/mmcblk1p2 16384 61071326 61054943 29.1G Linux filesystem

This allows me to run dd if=/path/to/idbloader.img of=/dev/mmcblk1p1 to update the bootloader.

libfdt is a Python library included in the dtc package.

Switch the Rock64 build from a newer, less maintained U-Boot tree, to an older but more maintained and featureful version.

lopsided98 · 2019-01-19T02:18:26Z

I made ubootRock64 and ubootRockPro64 use dtc 1.4.5. This requires some kind of ugly code but I don't see a better way of doing it.

ck3d · 2019-01-20T12:59:05Z

I could get the u-boot on my RockPro64 running. Thanks a lot for the PR!

JasonSwindle · 2019-01-23T20:38:27Z

@lopsided98 Where did you get idbloader.img from? Or did you compile it?

lopsided98 · 2019-01-24T01:38:24Z

@JasonSwindle It is one of the files in the ubootRock64 and ubootRockPro64 derivations.

JasonSwindle · 2019-01-24T03:30:37Z

Any plans to get it added to http://nixos-arm.dezgeg.me/installer ?

I was just reading over this ( https://nixos.wiki/wiki/NixOS_on_ARM#Contributing_new_boards_to_nixpkgs ), so I figured I would ask. :)

lopsided98 requested a review from FRidh as a code owner January 2, 2019 03:34

GrahamcOfBorg added the 6.topic: python label Jan 2, 2019

worldofpeace reviewed Jan 5, 2019

View reviewed changes

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

lopsided98 force-pushed the uboot-rockpro64 branch 2 times, most recently from c71557c to a6e52a2 Compare January 5, 2019 04:02

GrahamcOfBorg added 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jan 5, 2019

samueldr previously requested changes Jan 5, 2019

View reviewed changes

pkgs/misc/arm-trusted-firmware/default.nix Show resolved Hide resolved

lopsided98 force-pushed the uboot-rockpro64 branch from a6e52a2 to 3ac6975 Compare January 5, 2019 05:31

FRidh reviewed Jan 5, 2019

View reviewed changes

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

Mic92 requested a review from dezgeg January 5, 2019 11:34

lopsided98 force-pushed the uboot-rockpro64 branch from b2227db to 37103ca Compare January 18, 2019 03:41

lopsided98 changed the title ~~uboot: add RockPro64 support, fix Rock64 build, misc related changes~~ [WIP] uboot: add RockPro64 support, fix Rock64 build, misc related changes Jan 18, 2019

lopsided98 added 8 commits January 18, 2019 17:53

rkdeveloptool: init at 1.3

cc35ac7

arm-trusted-firmware: 1.5 -> 2.0

8a81672

arm-trusted-firmware: add RK3399

7edd038

pythonPackages.libfdt: init

bb72c06

libfdt is a Python library included in the dtc package.

uboot: add RockPro64, fix Rock64 build

e245086

Switch the Rock64 build from a newer, less maintained U-Boot tree, to an older but more maintained and featureful version.

uboot: buildUBoot: add extraConfig parameter

26079c4

uboot: use pname and cleanup version specification

404773e

ubootRock64, ubootRockPro64: use dtc 1.4.5

414c42a

lopsided98 force-pushed the uboot-rockpro64 branch from 37103ca to 414c42a Compare January 19, 2019 02:01

lopsided98 changed the title ~~[WIP] uboot: add RockPro64 support, fix Rock64 build, misc related changes~~ uboot: add RockPro64 support, fix Rock64 build, misc related changes Jan 19, 2019

Mic92 merged commit 615ed6d into NixOS:master Jan 21, 2019

lopsided98 deleted the uboot-rockpro64 branch January 21, 2019 22:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

uboot: add RockPro64 support, fix Rock64 build, misc related changes #53170

uboot: add RockPro64 support, fix Rock64 build, misc related changes #53170

lopsided98 commented Jan 2, 2019

lopsided98 commented Jan 5, 2019

FRidh left a comment

Mic92 commented Jan 5, 2019

Mic92 commented Jan 17, 2019

lopsided98 commented Jan 18, 2019 •

edited

lopsided98 commented Jan 18, 2019

Mic92 commented Jan 18, 2019

lopsided98 commented Jan 18, 2019

lopsided98 commented Jan 19, 2019

ck3d commented Jan 20, 2019 •

edited

JasonSwindle commented Jan 23, 2019

lopsided98 commented Jan 24, 2019

JasonSwindle commented Jan 24, 2019

uboot: add RockPro64 support, fix Rock64 build, misc related changes #53170

uboot: add RockPro64 support, fix Rock64 build, misc related changes #53170

Conversation

lopsided98 commented Jan 2, 2019

Motivation for this change

Things done

lopsided98 commented Jan 5, 2019

FRidh left a comment

Choose a reason for hiding this comment

Mic92 commented Jan 5, 2019

Mic92 commented Jan 17, 2019

lopsided98 commented Jan 18, 2019 • edited

lopsided98 commented Jan 18, 2019

Mic92 commented Jan 18, 2019

lopsided98 commented Jan 18, 2019

lopsided98 commented Jan 19, 2019

ck3d commented Jan 20, 2019 • edited

JasonSwindle commented Jan 23, 2019

lopsided98 commented Jan 24, 2019

JasonSwindle commented Jan 24, 2019

lopsided98 commented Jan 18, 2019 •

edited

ck3d commented Jan 20, 2019 •

edited