[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: gnu: u-boot-rockpro64-rk3399: Fix indentation.
From: |
guix-commits |
Subject: |
10/11: gnu: u-boot-rockpro64-rk3399: Fix indentation. |
Date: |
Thu, 1 Dec 2022 11:58:52 -0500 (EST) |
apteryx pushed a commit to branch master
in repository guix.
commit 24b0fe3463351b8516b200aec1ef47dab9dbb89d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Dec 1 11:37:38 2022 -0500
gnu: u-boot-rockpro64-rk3399: Fix indentation.
* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399): Fix indentation.
---
gnu/packages/bootloaders.scm | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index f2fc3198d0..68c5ec200f 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1000,36 +1000,36 @@ 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)
- (setenv "BL31"
- (search-input-file inputs "/bl31.elf"))))
- (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\\)")
- "
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'set-environment
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "BL31"
+ (search-input-file inputs "/bl31.elf"))))
+ (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_NVME(func) \\
BOOT_TARGET_SCSI(func) \\"))))
- ;; Phases do not succeed on the bl31 ELF.
- (delete 'strip)
- (delete 'validate-runpath)))))
+ ;; Phases do not succeed on the bl31 ELF.
+ (delete 'strip)
+ (delete 'validate-runpath)))))
(native-inputs
`(("firmware" ,arm-trusted-firmware-rk3399)
,@(package-native-inputs base))))))
- branch master updated (748ec62882 -> df25165530), guix-commits, 2022/12/01
- 01/11: build: kconfig: Add new module to modify defconfig files., guix-commits, 2022/12/01
- 02/11: gnu: grub: Normalize indentation., guix-commits, 2022/12/01
- 03/11: gnu: grub-efi32: Fix indentation., guix-commits, 2022/12/01
- 05/11: gnu: u-boot-tools: Fix indentation., guix-commits, 2022/12/01
- 06/11: gnu: make-u-boot-package: Fix indentation., guix-commits, 2022/12/01
- 04/11: gnu: dtc: Fix indentation., guix-commits, 2022/12/01
- 07/11: gnu: u-boot-nintendo-nes-classic-edition: Fix indentation., guix-commits, 2022/12/01
- 08/11: gnu: u-boot-puma-rk3399: Fix indentation., guix-commits, 2022/12/01
- 09/11: gnu: u-boot-firefly-rk3399: Fix indentation., guix-commits, 2022/12/01
- 10/11: gnu: u-boot-rockpro64-rk3399: Fix indentation.,
guix-commits <=
- 11/11: gnu: u-boot-pinebook-pro-rk3399: Fix indentation., guix-commits, 2022/12/01