ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: u-boot-rockpro64-rk3399: Use gexps and fix build.

Browse source 
* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399)
[phases]: Use gexps.
[native-inputs]: Use modify-inputs and turn into...
[inputs]: ... this.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Maxim Cournoyer 2023-01-01 19:25:25 -05:00
parent 4dd0378d47
commit ea0d3e1ec4
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gnu/packages/bootloaders.scm
View file

@ -1176,37 +1176,36 @@ (define-public u-boot-rockpro64-rk3399
(arguments (arguments
(substitute-keyword-arguments (package-arguments base) (substitute-keyword-arguments (package-arguments base)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'set-environment (add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "BL31" (setenv "BL31" (search-input-file inputs "/bl31.elf"))))
(search-input-file inputs "/bl31.elf")))) (add-after 'unpack 'patch-header
(add-after 'unpack 'patch-header (lambda _
(lambda _ (substitute* "include/config_distro_bootcmd.h"
(substitute* "include/config_distro_bootcmd.h" (("\"scsi_need_init=false")
(("\"scsi_need_init=false") "\"setenv scsi_need_init false")
"\"setenv scsi_need_init false") (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;")
(("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;") "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;"))
"#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;")) (substitute* "include/configs/rockchip-common.h"
(substitute* "include/configs/rockchip-common.h" (("#define BOOT_TARGET_DEVICES\\(func\\)")
(("#define BOOT_TARGET_DEVICES\\(func\\)") "
"
#if CONFIG_IS_ENABLED(CMD_SCSI) #if CONFIG_IS_ENABLED(CMD_SCSI)
#define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
#else #else
#define BOOT_TARGET_SCSI(func) #define BOOT_TARGET_SCSI(func)
#endif #endif
#define BOOT_TARGET_DEVICES(func)") #define BOOT_TARGET_DEVICES(func)")
(("BOOT_TARGET_NVME\\(func\\) \\\\") (("BOOT_TARGET_NVME\\(func\\) \\\\")
"\ "\
BOOT_TARGET_NVME(func) \\ BOOT_TARGET_NVME(func) \\
BOOT_TARGET_SCSI(func) \\")))) BOOT_TARGET_SCSI(func) \\"))))
;; Phases do not succeed on the bl31 ELF. ;; Phases do not succeed on the bl31 ELF.
(delete 'strip) (delete 'strip)
(delete 'validate-runpath))))) (delete 'validate-runpath)))))
(native-inputs (inputs
`(("firmware" ,arm-trusted-firmware-rk3399) (modify-inputs (package-inputs base)
,@(package-native-inputs base)))))) (append arm-trusted-firmware-rk3399))))))
(define-public u-boot-pinebook-pro-rk3399 (define-public u-boot-pinebook-pro-rk3399
(let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu"))) (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu")))