ubootRockPi4: init #103735
Merged
ubootRockPi4: init #103735
Conversation
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 |
samueldr
Nov 14, 2020
Member
Something smells fishy here. The idbloader.img
isn't produced by that defconfig like every other rk3399 defconfig?
Something smells fishy here. The idbloader.img
isn't produced by that defconfig like every other rk3399 defconfig?
andir
Nov 14, 2020
Author
Member
I guess this comment can be resolved as the code I had here was just duplicating efforts?
I guess this comment can be resolved as the code I had here was just duplicating efforts?
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 With this applied:
And your commit untouched:
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. |
b8c1348
into
NixOS:master
19 of 20 checks passed
19 of 20 checks passed
grahamcofborg-eval-darwin
nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a5047b"; rev="7a5047bede8f7851eac2fcc4d257d07cc5f6eda7"; } ./pkgs/t
Details
grahamcofborg-eval-nixos
nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a5047b"; rev="7a5047bede8f7851eac2fcc4d257d07cc5f6eda7"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual
nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a5047b"; rev="7a5047bede8f7851eac2fcc4d257d07cc5f6eda7"; } ./nixos/
Details
grahamcofborg-eval-nixos-options
nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a5047b"; rev="7a5047bede8f7851eac2fcc4d257d07cc5f6eda7"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual
nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a5047b"; rev="7a5047bede8f7851eac2fcc4d257d07cc5f6eda7"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball
nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a5047b"; rev="7a5047bede8f7851eac2fcc4d257d07cc5f6eda7"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset
nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a5047b"; rev="7a5047bede8f7851eac2fcc4d257d07cc5f6eda7"; } ./pkgs/t
Details
grahamcofborg-eval-package-list-no-aliases
nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
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.
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/
)