Browse Source

Makefile: modify makfile rules

Modify the spl image path
In addition, the spl image does not write to the sd card by default

Signed-off-by: Clivia.Cai <Clivia.Cai@starfivetech.com>
Clivia.Cai 2 years ago
parent
commit
8aba28ceb2
1 changed files with 4 additions and 2 deletions
  1. 4 2
      Makefile

+ 4 - 2
Makefile

@@ -73,7 +73,7 @@ uboot_dtb_file := $(wrkdir)/u-boot/arch/riscv/dts/starfive_$(HWBOARD).dtb
 
 uboot := $(uboot_wrkdir)/u-boot.bin
 
-spl_payload :=$(srcdir)/u-boot-spl.bin.normal.out
+spl_payload :=$(wrkdir)/u-boot-spl.bin.normal.out
 
 uboot_config := starfive_$(HWBOARD)_defconfig
 
@@ -382,7 +382,7 @@ else
 	@echo Error: Could not find bootloader partition for $(DISK)
 	@exit 1
 endif
-	dd if=$(spl_payload)   of=$(PART1) bs=4096
+	#dd if=$(spl_payload)   of=$(PART1) bs=4096
 	dd if=$(uboot_fit) of=$(PART2) bs=4096
 	dd if=$(vfat_image) of=$(PART3) bs=4096
 
@@ -399,6 +399,8 @@ format-rootfs-image: format-boot-loader
 		sudo cp -fr tmp-rootfs/* tmp-mnt/
 	sudo umount tmp-mnt
 	sudo umount tmp-rootfs
+	rmdir tmp-mnt
+	rmdir tmp-rootfs
 
 
 #usb config