From 38ae283cb4f6385dca56aa6c0baf5dbdd83cd1bc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Feb 2022 02:58:59 +0100 Subject: riscv: use default BIOS included in qemu --- target/riscv64/Makefile | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'target/riscv64/Makefile') diff --git a/target/riscv64/Makefile b/target/riscv64/Makefile index c2b50a688..44dd98351 100644 --- a/target/riscv64/Makefile +++ b/target/riscv64/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/riscv/boot/Image -QEMU_ARGS:=-M virt -m 512 -nographic -bios $(FW_DIR)/fw_jump.elf +QEMU_ARGS:=-M virt -m 512 -nographic ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0 endif @@ -53,26 +53,16 @@ kernel-strip: kernel-install: kernel-strip -boot: - @rm -rf $(BUILD_DIR)/opensbi - (cd $(BUILD_DIR)/ && git clone https://github.com/riscv/opensbi.git) - (cd $(BUILD_DIR)/opensbi && PATH='$(HOST_PATH)' \ - CROSS_COMPILE=$(GNU_TARGET_NAME)- \ - FW_PAYLOAD_PATH=$(KERNEL) \ - PLATFORM=generic make) - cp $(BUILD_DIR)/opensbi/build/platform/generic/firmware/fw_jump.elf \ - $(FW_DIR) - # filesystem specific targets ifeq ($(ADK_TARGET_FS),archive) -imageinstall: kernel-install boot $(FW_DIR)/$(ROOTFSTARBALL) targethelp +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSTARBALL) targethelp endif ifeq ($(ADK_TARGET_FS),initramfs) -imageinstall: kernel-install boot $(FW_DIR)/$(INITRAMFS) targethelp +imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: kernel-install boot $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif ifeq ($(ADK_TARGET_FS),initramfspiggyback) -imageinstall: createinitramfs boot targethelp +imageinstall: createinitramfs targethelp endif -- cgit v1.2.3