* [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399
@ 2020-12-28 6:00 Caliph Nomble via Guix-patches via
2020-12-28 18:40 ` Danny Milosavljevic
0 siblings, 1 reply; 5+ messages in thread
From: Caliph Nomble via Guix-patches via @ 2020-12-28 6:00 UTC (permalink / raw)
To: 45478; +Cc: Caliph Nomble
* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399): Build with modified
config to prevent freeze on boot due to usb being enabled.
---
gnu/packages/bootloaders.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 7034085d67..078bc3156e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -868,7 +868,14 @@ to Novena upstream, does not load u-boot.img from the first partition.")
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
- (add-after 'unpack 'set-environment
+ (add-after 'unpack 'patch-rockpro64-config
+ ;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled.
+ ;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4
+ (lambda _
+ (substitute* "configs/rockpro64-rk3399_defconfig"
+ (("CONFIG_USE_PREBOOT=y") "CONFIG_USE_PREBOOT=n"))
+ #t))
+ (add-after 'patch-rockpro64-config 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "BL31" (string-append (assoc-ref inputs "firmware")
"/bl31.elf"))
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399
2020-12-28 6:00 [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399 Caliph Nomble via Guix-patches via
@ 2020-12-28 18:40 ` Danny Milosavljevic
2020-12-29 7:23 ` Caliph Nomble via Guix-patches via
0 siblings, 1 reply; 5+ messages in thread
From: Danny Milosavljevic @ 2020-12-28 18:40 UTC (permalink / raw)
To: 45478; +Cc: Caliph Nomble, 45478-done
[-- Attachment #1: Type: text/plain, Size: 107 bytes --]
Hi,
thanks for the patch!
Pushed to guix master as commit d980e6e275aed80e65ad3b7e17c5a5118661e2c2.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399
2020-12-28 18:40 ` Danny Milosavljevic
@ 2020-12-29 7:23 ` Caliph Nomble via Guix-patches via
2020-12-29 12:33 ` Danny Milosavljevic
0 siblings, 1 reply; 5+ messages in thread
From: Caliph Nomble via Guix-patches via @ 2020-12-29 7:23 UTC (permalink / raw)
To: 45478@debbugs.gnu.org
Hi,
I'm sorry, but I didn't realize there were changes to gnu/packages/bootloaders.scm on master after v1.2.0, and wrote the patch based on that version. At the moment, the patch as committed to master has been applied to u-boot-firefly-rk3399, not u-boot-rockpro64-rk3399. I can submit a new patch to fix this, but I'm not sure how to handle it in regards to the changelog system?
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399
2020-12-29 7:23 ` Caliph Nomble via Guix-patches via
@ 2020-12-29 12:33 ` Danny Milosavljevic
2020-12-29 21:34 ` Leo Famulari
0 siblings, 1 reply; 5+ messages in thread
From: Danny Milosavljevic @ 2020-12-29 12:33 UTC (permalink / raw)
To: Caliph Nomble; +Cc: 45478@debbugs.gnu.org
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
Hi,
thanks for the heads-up.
Reverted in guix master commit 7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2
and then fixed correctly (manually) in guix master
commit 219612904c005328d892aaf9737c37a91635db2a.
Good to know that such a thing can happen with git am. I was of the impression
it would check the git commit ids before patching--but apparently not O_o
Thanks again.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399
2020-12-29 12:33 ` Danny Milosavljevic
@ 2020-12-29 21:34 ` Leo Famulari
0 siblings, 0 replies; 5+ messages in thread
From: Leo Famulari @ 2020-12-29 21:34 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 45478@debbugs.gnu.org, Caliph Nomble
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
On Tue, Dec 29, 2020 at 01:33:58PM +0100, Danny Milosavljevic wrote:
> Hi,
>
> thanks for the heads-up.
>
> Reverted in guix master commit 7d440cdbfdf6f2164895d448fe3e5bfce1ce4ea2
> and then fixed correctly (manually) in guix master
> commit 219612904c005328d892aaf9737c37a91635db2a.
>
> Good to know that such a thing can happen with git am. I was of the impression
> it would check the git commit ids before patching--but apparently not O_o
The application of patches can be really tricky. If it can go wrong...
it will!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-29 21:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-28 6:00 [bug#45478] [PATCH] gnu: u-boot: Fix freeze on boot with u-boot-rockpro64-rk3399 Caliph Nomble via Guix-patches via
2020-12-28 18:40 ` Danny Milosavljevic
2020-12-29 7:23 ` Caliph Nomble via Guix-patches via
2020-12-29 12:33 ` Danny Milosavljevic
2020-12-29 21:34 ` Leo Famulari
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.