GNU bug report logs - #74842
[PATCH 1/4] gnu: bootloader: u-boot: Add u-boot-rockchip-bootloader.

Previous Next

Full log

Message #11 received at 74842 <at> debbugs.gnu.org (full text, mbox):

From: Herman Rimm <herman <at> rimm.ee>
To: 74842 <at> debbugs.gnu.org
Subject: [PATCH 3/4] gnu: u-boot-rockpro64-rk3399: Remove obsolete substitute.
Date: Thu, 12 Dec 2024 22:07:10 +0100

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

Change-Id: I27dbc51c0eb95de9e1474c966a4e97f7cff26009
---
 gnu/packages/bootloaders.scm | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 788c7dc9ef..15cdaddd7e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1475,26 +1475,8 @@ (define-public u-boot-rockpro64-rk3399
               (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))))))
-- 
2.45.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.