From 65b25cd0f268e989dfa5f1efcfca1e75ca38af64 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 8 Apr 2018 11:16:17 +0100 Subject: riscv: fix kernel boot in qemu --- target/riscv32/Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'target/riscv32') diff --git a/target/riscv32/Makefile b/target/riscv32/Makefile index 30099fb55..9b268093a 100644 --- a/target/riscv32/Makefile +++ b/target/riscv32/Makefile @@ -29,15 +29,25 @@ kernel-strip: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) kernel-install: kernel-strip - @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + +bbl: + @mkdir -p $(BUILD_DIR)/bbl + @rm -rf $(BUILD_DIR)/riscv-pk + (cd $(BUILD_DIR)/ && git clone https://github.com/riscv/riscv-pk.git) + (cd $(BUILD_DIR)/bbl && PATH='$(HOST_PATH)' ../riscv-pk/configure \ + --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME) \ + --with-payload=$(FW_DIR)/$(TARGET_KERNEL)) + (cd $(BUILD_DIR)/bbl && PATH='$(HOST_PATH)' make) + cp $(BUILD_DIR)/bbl/bbl $(FW_DIR)/$(TARGET_KERNEL).bbl # filesystem specific targets ifeq ($(ADK_TARGET_FS),initramfs) -imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp +imageinstall: kernel-install bbl $(FW_DIR)/$(INITRAMFS) targethelp endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +imageinstall: kernel-install bbl $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif ifeq ($(ADK_TARGET_FS),initramfspiggyback) -imageinstall: createinitramfs targethelp +imageinstall: createinitramfs bbl targethelp endif -- cgit v1.2.3