From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vagrant Cascadian Date: Tue, 17 Dec 2019 17:05:56 -0800 Subject: [U-Boot] [PATCH] qemu-riscv64_smode, sifive-fu540: fix extlinux (define preboot) In-Reply-To: <87r243g6us.fsf@yucca> References: <20190821190720.4286-1-david.abdurachmanov@sifive.com> <87r243g6us.fsf@yucca> Message-ID: <87imme1lzf.fsf@yucca> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 2019-09-25, Vagrant Cascadian wrote: > On 2019-08-21, David Abdurachmanov wrote: >> 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. > > Tested using qemu-riscv64_smode and it fixes extlinux booting. Thanks! > > Please CC me on future updates to the patch series. > > Tested-by: Vagrant Cascadian This patch, or something like it, is still needed with u-boot v2020.01-rc5 for extlinux support to load the device-tree from the boot firmware. Is there a new approach in the works, or any chance to see something like this get merged soon? Thanks! live well, vagrant >> Signed-off-by: David Abdurachmanov >> --- >> configs/qemu-riscv64_smode_defconfig | 2 ++ >> configs/sifive_fu540_defconfig | 2 ++ >> include/configs/sifive-fu540.h | 4 ---- >> 3 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig >> index 74743a5ebe..2e1f7fa91f 100644 >> --- a/configs/qemu-riscv64_smode_defconfig >> +++ b/configs/qemu-riscv64_smode_defconfig >> @@ -9,3 +9,5 @@ CONFIG_DISPLAY_CPUINFO=y >> CONFIG_DISPLAY_BOARDINFO=y >> # CONFIG_CMD_MII is not set >> CONFIG_OF_PRIOR_STAGE=y >> +CONFIG_USE_PREBOOT=y >> +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" >> diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig >> index 48865e5f11..a852579309 100644 >> --- a/configs/sifive_fu540_defconfig >> +++ b/configs/sifive_fu540_defconfig >> @@ -9,3 +9,5 @@ CONFIG_MISC_INIT_R=y >> CONFIG_DISPLAY_CPUINFO=y >> CONFIG_DISPLAY_BOARDINFO=y >> CONFIG_OF_PRIOR_STAGE=y >> +CONFIG_USE_PREBOOT=y >> +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" >> diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h >> index 858b7a7da1..ba4aa0652c 100644 >> --- a/include/configs/sifive-fu540.h >> +++ b/include/configs/sifive-fu540.h >> @@ -40,8 +40,4 @@ >> "ramdisk_addr_r=0x88300000\0" \ >> BOOTENV >> >> -#define CONFIG_PREBOOT \ >> - "setenv fdt_addr ${fdtcontroladdr};" \ >> - "fdt addr ${fdtcontroladdr};" >> - >> #endif /* __CONFIG_H */ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 227 bytes Desc: not available URL: