From 3fc056f0b9f7c26e58a1e947c8c0184e55919614 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov 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 . The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT to Kconfig. Signed-off-by: David Abdurachmanov --- 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_fu540_defconfig +++ u-boot/configs/sifive_fu540_defconfig @@ -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_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" 8d7edf19ee02fc3a554dea04bc'/>
AgeCommit message (Expand)Author
2019-08-13Merge branch 'master' into core-updatesMarius Bakke
2019-08-04gnu: Remove pcre2/fixed....* gnu/packages/pcre.scm (pcre2/fixed): Remove variable. (pcre2)[replacement]: Remove. [source](patches): New field. * gnu/packages/php.scm (php)[inputs]: Change PCRE2/FIXED to PCRE2. Marius Bakke
2019-08-02gnu: pcre@2: Fix run-time crash [security fix]....* gnu/packages/pcre.scm (pcre2)[replacement]: New field. (pcre2/fixed): New public variable. * packages/patches/pcre2-fix-jit_match-crash.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Tobias Geerinckx-Rice
2019-05-25Merge branch 'staging' into core-updatesMarius Bakke
2019-05-04gnu: pcre2: Update to 10.33....* gnu/packages/pcre.scm (pcre2): Update to 10.33. Marius Bakke
2019-03-04gnu: pcre: Update to 8.43....* gnu/packages/pcre.scm (pcre): Update to 8.43. Marius Bakke
2019-02-07gnu: pcre2: Update to 10.32....* gnu/packages/pcre.scm (pcre2): Update to 10.32. Marius Bakke