diff options
| author | Herman Rimm <herman@rimm.ee> | 2024-12-12 22:07:10 +0100 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2025-03-04 10:19:43 -0800 |
| commit | 7edd5fdf23db4704d51f3f0b54175bed694e7e62 (patch) | |
| tree | 4b458ef1d1ec9611215cbd5cf3c00c358390a61e | |
| parent | 5196b49756ca2d21f16c2abd8ca8d91163c4b13e (diff) | |
| download | guix-7edd5fdf23db4704d51f3f0b54175bed694e7e62.tar.gz guix-7edd5fdf23db4704d51f3f0b54175bed694e7e62.zip | |
gnu: u-boot-rockpro64-rk3399: Remove obsolete substitute.
* 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>
| -rw-r--r-- | gnu/packages/bootloaders.scm | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 01497678cd..ee417ab8b9 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -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)))))) |