bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: u-boot-rockpro64-rk3399: Remove obsolete substitute.

Browse source 
* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399)[arguments]:
Merge substitutes.  Remove non-matching substitute.

Change-Id: I27dbc51c0eb95de9e1474c966a4e97f7cff26009
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
This commit is contained in:
Herman Rimm 2024-12-12 22:07:10 +01:00 • committed by Vagrant Cascadian
parent 5196b49756
commit 7edd5fdf23
No known key found for this signature in database
GPG key ID: DC518FC87F9716AA
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/bootloaders.scm
View file

@ -1470,26 +1470,8 @@ Documentation} for more information (for example by running @samp{info
(add-after 'unpack 'patch-header
(lambda _
(substitute* "include/config_distro_bootcmd.h"
(("\"scsi_need_init=false")
"\"setenv scsi_need_init false")
(("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;")
"#define BOOTENV_SET_SCSI_NEED_INIT \"setenv scsi_need_init;"))
(substitute* "include/configs/rockchip-common.h"
(("#define BOOT_TARGET_DEVICES\\(func\\)")
"
#if CONFIG_IS_ENABLED(CMD_SCSI)
#define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
#else
#define BOOT_TARGET_SCSI(func)
#endif
#define BOOT_TARGET_DEVICES(func)")
(("BOOT_TARGET_NVME\\(func\\) \\\\")
"\
BOOT_TARGET_NVME(func) \\
BOOT_TARGET_SCSI(func) \\"))))
;; Phases do not succeed on the bl31 ELF.
(delete 'strip)
(delete 'validate-runpath)))))
(("\"scsi_need_init=")
"\"setenv scsi_need_init"))))))))
(inputs
(modify-inputs (package-inputs base)
(append arm-trusted-firmware-rk3399))))))