diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
commit | 284fa7264963acc5d114ef5d54c347126b1654ba (patch) | |
tree | 3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch | |
parent | 12c9da35389dfba86ae0d863132a6b2c4374205a (diff) | |
parent | 882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff) | |
download | guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch')
-rw-r--r-- | gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch b/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch deleted file mode 100644 index 468024ab00..0000000000 --- a/gnu/packages/patches/u-boot-riscv64-fix-extlinux.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3fc056f0b9f7c26e58a1e947c8c0184e55919614 Mon Sep 17 00:00:00 2001 -From: David Abdurachmanov <david.abdurachmanov@gmail.com> -Date: Wed, 21 Aug 2019 12:07:20 -0700 -Subject: [PATCH] qemu-riscv64_smode, sifive-fu540: fix extlinux (define - preboot) -Forwarded: https://patchwork.ozlabs.org/patch/1151125/ - -Commit 37304aaf60bf92a5dc3ef222ba520698bd862a44 removed preboot -commands in RISC-V targets and broke extlinux support as reported -by Fu Wei <wefu@redhat.com>. - -The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT -to Kconfig. - -Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com> ---- - configs/qemu-riscv64_smode_defconfig | 2 ++ - configs/sifive_fu540_defconfig | 2 ++ - 3 files changed, 4 insertions(+), 4 deletions(-) - -Index: u-boot/configs/qemu-riscv64_smode_defconfig -=================================================================== ---- u-boot.orig/configs/qemu-riscv64_smode_defconfig -+++ u-boot/configs/qemu-riscv64_smode_defconfig -@@ -14,3 +14,5 @@ CONFIG_CMD_NVEDIT_EFI=y - CONFIG_OF_PRIOR_STAGE=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_DM_MTD=y -+CONFIG_USE_PREBOOT=y -+CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" -Index: u-boot/configs/sifive_fu540_defconfig -=================================================================== ---- u-boot.orig/configs/sifive_unleashed_defconfig -+++ u-boot/configs/sifive_unleashed_defconfig -@@ -27,3 +27,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_SPL_CLK=y - CONFIG_DM_MTD=y - CONFIG_DM_RESET=y -+CONFIG_USE_PREBOOT=y -+CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" |