diff options
| author | Vagrant Cascadian <vagrant@debian.org> | 2021-02-08 07:06:32 -0800 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2021-02-08 07:18:41 -0800 |
| commit | 15990546a5c26742fcbc7f7aa56b2a6db09dc643 (patch) | |
| tree | 1e4ac05a8def4699e77db9fce2bc3a1097d255a7 /gnu/packages/bootloaders.scm | |
| parent | be33acc260a0759909a44ebad6043a9853f44bbe (diff) | |
| download | guix-patches-15990546a5c26742fcbc7f7aa56b2a6db09dc643.tar guix-patches-15990546a5c26742fcbc7f7aa56b2a6db09dc643.tar.gz | |
gnu: u-boot-puma-rk3399: Switch to using arm-trusted-firmware-rk3399.
* gnu/packages/bootloaders.scm (u-boot-puma-rk3399)[native-inputs]:
Add arm-trusted-firmware-rk3399.
Remove arm-trusted-firmware-puma-rk3399 and rk3399-cortex-m0.
* gnu/packages/firmware.scm (arm-trusted-firmware-puma-rk3399,
rk3399-cortex-m0): Remove obsolete variables.
* gnu/bootloader/u-boot.scm (install-puma-rk3399-u-boot): Install
idbloader.img.
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 60556dc501..99281b2cc6 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -813,30 +813,19 @@ to Novena upstream, does not load u-boot.img from the first partition.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - ;; Need to copy the firmware into u-boot build - ;; directory. - (copy-file (string-append (assoc-ref inputs "firmware") - "/bl31.bin") "bl31-rk3399.bin") - (copy-file (string-append (assoc-ref inputs "firmware-m0") - "/rk3399m0.bin") "rk3399m0.bin") - #t)) - (add-after 'build 'build-itb - (lambda* (#:key make-flags #:allow-other-keys) - ;; The u-boot.itb is not built by default. - (apply invoke "make" `(,@make-flags ,"u-boot.itb")))) - (add-after 'build-itb 'build-rksd - (lambda* (#:key inputs #:allow-other-keys) - ;; Build Rockchip SD card images. - (invoke "./tools/mkimage" "-T" "rksd" "-n" "rk3399" "-d" - "spl/u-boot-spl.bin" "u-boot-spl.rksd"))))))) + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "BL31" (string-append (assoc-ref inputs "firmware") + "/bl31.elf")) + #t)) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) (native-inputs - `(("firmware" ,arm-trusted-firmware-puma-rk3399) - ("firmware-m0" ,rk3399-cortex-m0) + `(("firmware" ,arm-trusted-firmware-rk3399) ,@(package-native-inputs base)))))) (define-public u-boot-qemu-riscv64 |