riscv64: add cleanups for BBL build

Signed-off-by: Zoltan HERPAI <[email protected]>

diff --git a/target/linux/riscv64/image/Makefile b/target/linux/riscv64/image/Makefile
index 7853e1b684f6639404469874e9ef961c48095503..7b518d8b1f4d11ceaf235eed1a5bddc8dce11751 100644 (file)
--- a/target/linux/riscv64/image/Makefile
+++ b/target/linux/riscv64/image/Makefile
@@ -11,14 +11,7 @@ define Build/Clean
        $(MAKE) -C bbl clean
 endef
 
-#define Build/Compile
-#      $(MAKE) -C bbl compile
-#      $(MAKE) -C u-boot compile
-#endef
-
 define Image/Prepare
-       # sneak in a cleanup here
-#      $(MAKE) -C u-boot clean
        cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
 endef
 
@@ -29,18 +22,13 @@ define Image/Build/riscv-sdcard
                $(KDIR)/root.$(1) \
                $(CONFIG_RISCV64_SD_BOOT_PARTSIZE) \
                $(CONFIG_TARGET_ROOTFS_PARTSIZE)
-#              $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)-u-boot-with-spl.bin
 endef
 
 define Image/Build
-       echo "BUILD: $(1)"
-       echo "PROFILE: $(PROFILE)"
        $(MAKE) -C bbl compile
-#      cp $(BIN_DIR)/bbl.bin
-#      cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
        $(call Image/Build/riscv-sdcard,$(1),$(IMG_PREFIX)-$(PROFILE)-sdcard.img)
-
-#      rm -f [email protected]
+       
+       $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/
 endef
 
 $(eval $(call BuildImage))

diff --git a/target/linux/riscv64/image/bbl/Makefile b/target/linux/riscv64/image/bbl/Makefile
index 37278b1c9fcd80f2c5e7a30355f43f600cdce23e..c1a15987f65e0ad397958e90822ae10dbc5d1222 100644 (file)
--- a/target/linux/riscv64/image/bbl/Makefile
+++ b/target/linux/riscv64/image/bbl/Makefile
@@ -28,11 +28,12 @@ $(PKG_BUILD_DIR)/.prepared:
        mkdir $(PKG_BUILD_DIR)
        $(CP) ./src/* $(PKG_BUILD_DIR)/
        mkdir $(PKG_BUILD_DIR)/work
-       cd $(PKG_BUILD_DIR)/work; $(CONFIG_VARS) ../configure $(CONFIGURE_ARGS)
+       cd $(PKG_BUILD_DIR)/work; chmod +x ../configure; $(CONFIG_VARS) ../configure $(CONFIGURE_ARGS)
        touch $@
 
 $(PKG_BUILD_DIR)/bbl: $(PKG_BUILD_DIR)/.prepared
        $(MAKE) -C $(PKG_BUILD_DIR)/work bbl
+       $(CP) $(PKG_BUILD_DIR)/work/bbl $(BIN_DIR)/bbl.qemu
        $(TARGET_CROSS)objcopy -S -O binary --change-addresses -0x80000000 $(PKG_BUILD_DIR)/work/bbl $(BIN_DIR)/bbl.bin
 
 download: