diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-23 09:34:50 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-23 09:40:36 -0400 |
| commit | 3b026eb3b1dd92c653d1a640b1280b96cfea3084 (patch) | |
| tree | 0b69e0c5a6735e404605bd696125a70a024ad9ae | |
| parent | 15ccab1e8edad3b6db3bb82a98b338ec22b72041 (diff) | |
| download | guix-3b026eb3b1dd92c653d1a640b1280b96cfea3084.tar.gz guix-3b026eb3b1dd92c653d1a640b1280b96cfea3084.zip | |
Revert "gnu: u-boot: Update to 2020.10."
This reverts commit fe6067fc248673d6509b557ff010778f7762382f. This commit
broke u-boot-tools.
| -rw-r--r-- | gnu/packages/bootloaders.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 05380fc42b..d1de5cea4e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -446,7 +446,7 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2020.10") + (version "2020.07") (source (origin (method url-fetch) (uri (string-append @@ -454,7 +454,7 @@ tree binary files. These are board description files used by Linux and BSD.") "u-boot-" version ".tar.bz2")) (sha256 (base32 - "08m6f1bh4pdcqbxf983qdb66ccd5vak5cbzc114yf3jwq2yinj0d")))) + "0sjzy262x93aaqd6z24ziaq19xjjjk5f577ivf768vmvwsgbzxf1")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) diff --git a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch b/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch index d6c1987718..29dec4f5e9 100644 --- a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch +++ b/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch @@ -32,9 +32,9 @@ Index: u-boot/configs/sifive_fu540_defconfig =================================================================== --- u-boot.orig/configs/sifive_fu540_defconfig +++ u-boot/configs/sifive_fu540_defconfig -@@ -27,3 +27,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_SPL_CLK=y +@@ -12,3 +12,5 @@ CONFIG_DISPLAY_BOARDINFO=y + CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00" + CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM_MTD=y - CONFIG_DM_RESET=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" |