build: Simplify mkfatimg invocation

Since commit 2f28cf8 ("Fix segmentation fault") mkfatimg supports invoking it without specifying a filesystem image size in the command line. Until the, it was required to specify 0 as size to autocalculate the size. This commit removes all now unneeded zeroes from the makefiles where mkfatimg is invoked.
blocksds · Jul 26, 2023 · 41b479b · 41b479b
1 parent 7e8c884
commit 41b479b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/examples/libxm7/Makefile b/examples/libxm7/Makefile
@@ -80,7 +80,7 @@ NDSTOOL_FAT	:= -F $(NITROFAT_IMG)
 
 $(NITROFAT_IMG): $(NITROFATDIR)
 	@echo "  MKFATIMG $@ $(NITROFATDIR)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@ 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@
 
 # Make the NDS ROM depend on the filesystem image only if it is needed
 $(ROM): $(NITROFAT_IMG)
@@ -102,7 +102,7 @@ $(ROM): arm9 arm7
 
 sdimage:
 	@echo "  MKFATIMG $(SDIMAGE) $(SDROOT)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE) 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE)
 
 dldipatch: $(ROM)
 	@echo "  DLDITOOL $(ROM)"

diff --git a/examples/nocash_debug/Makefile b/examples/nocash_debug/Makefile
@@ -80,7 +80,7 @@ NDSTOOL_FAT	:= -F $(NITROFAT_IMG)
 
 $(NITROFAT_IMG): $(NITROFATDIR)
 	@echo "  MKFATIMG $@ $(NITROFATDIR)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@ 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@
 
 # Make the NDS ROM depend on the filesystem image only if it is needed
 $(ROM): $(NITROFAT_IMG)
@@ -102,7 +102,7 @@ $(ROM): arm9 arm7
 
 sdimage:
 	@echo "  MKFATIMG $(SDIMAGE) $(SDROOT)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE) 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE)
 
 dldipatch: $(ROM)
 	@echo "  DLDITOOL $(ROM)"

diff --git a/templates/rom_arm9_only/Makefile b/templates/rom_arm9_only/Makefile
@@ -185,7 +185,7 @@ NDSTOOL_FAT	:= -F $(NITROFAT_IMG)
 
 $(NITROFAT_IMG): $(NITROFATDIR)
 	@echo "  MKFATIMG $@ $(NITROFATDIR)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@ 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@
 
 # Make the NDS ROM depend on the filesystem image only if it is needed
 $(ROM): $(NITROFAT_IMG)
@@ -222,7 +222,7 @@ clean:
 
 sdimage:
 	@echo "  MKFATIMG $(SDIMAGE) $(SDROOT)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE) 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE)
 
 dldipatch: $(ROM)
 	@echo "  DLDITOOL $(ROM)"

diff --git a/templates/rom_combined/Makefile b/templates/rom_combined/Makefile
@@ -80,7 +80,7 @@ NDSTOOL_FAT	:= -F $(NITROFAT_IMG)
 
 $(NITROFAT_IMG): $(NITROFATDIR)
 	@echo "  MKFATIMG $@ $(NITROFATDIR)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@ 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@
 
 # Make the NDS ROM depend on the filesystem image only if it is needed
 $(ROM): $(NITROFAT_IMG)
@@ -102,7 +102,7 @@ $(ROM): arm9 arm7
 
 sdimage:
 	@echo "  MKFATIMG $(SDIMAGE) $(SDROOT)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE) 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE)
 
 dldipatch: $(ROM)
 	@echo "  DLDITOOL $(ROM)"

diff --git a/tests/Makefile.include b/tests/Makefile.include
@@ -166,7 +166,7 @@ NDSTOOL_FAT	:= -F $(NITROFAT_IMG)
 
 $(NITROFAT_IMG): $(NITROFATDIR)
 	@echo "  MKFATIMG $@ $(NITROFATDIR)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@ 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@
 
 # Make the NDS ROM depend on the filesystem image only if it is needed
 $(ROM): $(NITROFAT_IMG)
@@ -203,7 +203,7 @@ clean:
 
 sdimage:
 	@echo "  MKFATIMG $(SDIMAGE) $(SDROOT)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE) 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE)
 
 dldipatch: $(ROM)
 	@echo "  DLDITOOL $(ROM)"

diff --git a/tests/fifo_stress_test/Makefile b/tests/fifo_stress_test/Makefile
@@ -80,7 +80,7 @@ NDSTOOL_FAT	:= -F $(NITROFAT_IMG)
 
 $(NITROFAT_IMG): $(NITROFATDIR)
 	@echo "  MKFATIMG $@ $(NITROFATDIR)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@ 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(NITROFATDIR) $@
 
 # Make the NDS ROM depend on the filesystem image only if it is needed
 $(ROM): $(NITROFAT_IMG)
@@ -102,7 +102,7 @@ $(ROM): arm9 arm7
 
 sdimage:
 	@echo "  MKFATIMG $(SDIMAGE) $(SDROOT)"
-	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE) 0
+	$(V)$(BLOCKSDS)/tools/mkfatimg/mkfatimg -t $(SDROOT) $(SDIMAGE)
 
 dldipatch: $(ROM)
 	@echo "  DLDITOOL $(ROM)"