ubootRockPi4: init #103735
Merged
ubootRockPi4: init #103735
+8
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
10.rebuild-darwin: 0
samueldr
reviewed
Nov 14, 2020
pkgs/misc/uboot/default.nix
Outdated
| BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; | ||
| filesToInstall = [ "u-boot.itb" "idbloader.img"]; | ||
| postBuild = '' | ||
| ./tools/mkimage -n rk3399 -T rksd -d tpl/u-boot-tpl.bin idbloader.img |
There was a problem hiding this comment.
Something smells fishy here. The idbloader.img isn't produced by that defconfig like every other rk3399 defconfig?
There was a problem hiding this comment.
I guess this comment can be resolved as the code I had here was just duplicating efforts?
samueldr
suggested changes
Nov 14, 2020
There was a problem hiding this comment.
I cannot verify on hardware, but how does this work for you?
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 0bb030a86a0..0a178b39800 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -400,9 +400,5 @@ in {
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareRK3399}/bl31.elf";
filesToInstall = [ "u-boot.itb" "idbloader.img"];
- postBuild = ''
- ./tools/mkimage -n rk3399 -T rksd -d tpl/u-boot-tpl.bin idbloader.img
- cat spl/u-boot-spl.bin >> idbloader.img
- '';
};
}Using nix-build -A pkgsCross.aarch64-multiplatform.ubootRockPi4
With this applied:
@DUFFMAN ~/tmp/nixpkgs/nixpkgs-103735 $ file result/*
result/idbloader.img: data
result/u-boot.itb: Device Tree Blob version 17, size=1396, boot CPU=0, string block size=131, DT structure block size=1208
@DUFFMAN ~/tmp/nixpkgs/nixpkgs-103735 $ sha256sum result/*
5603261c91833d53495da0c1267846405d4a30def5c4a8b414ba05db3ff014bf result/idbloader.img
4c29ebe130b4628e766ab3b93a1abb670e4886d19000f0c719d93e30e8606a74 result/u-boot.itb
And your commit untouched:
@DUFFMAN ~/tmp/nixpkgs/nixpkgs-103735 $ file result/*
result/idbloader.img: data
result/u-boot.itb: Device Tree Blob version 17, size=1396, boot CPU=0, string block size=131, DT structure block size=1208
@DUFFMAN ~/tmp/nixpkgs/nixpkgs-103735 $ sha256sum result/*
5603261c91833d53495da0c1267846405d4a30def5c4a8b414ba05db3ff014bf result/idbloader.img
4c29ebe130b4628e766ab3b93a1abb670e4886d19000f0c719d93e30e8606a74 result/u-boot.itb
It looks like you've been re-implemented a small bit of the existing build!
This adds support for the Radxa Rock Pi 4 board which is based on
RK3399. The u-boot outputs from the introduced build are suitable to
build a generic image for the Rock Pi 4 by setting the following in a
custom build of $nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix:
```
sdImage.postBuildCommands = ''
dd if=${pkgs.ubootRockPi4}/idbloader.img of=$img seek=64 conv=notrunc
dd if=${pkgs.ubootROckPi4}/u-boot.itb of=$img seek=16384 conv=notrunc
'';
```
|
Ha, thanks! I've removed that custom part. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This adds support for the Radxa Rock Pi 4 board which is based on
RK3399. The u-boot outputs from the introduced build are suitable to
build a generic image for the Rock Pi 4 by setting the following in a
custom build of $nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix:
cc @samueldr
Things done
nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)