Intermediate top-level build products go to build/

SciresM · May 19, 2017 · 9515fff · 9515fff
1 parent 376beb6
commit 9515fff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -2,10 +2,12 @@ all: boot9strap
 
 boot9strap:
 	mkdir -p out
+	mkdir -p build
 	cd arm9_stage2 && $(MAKE)
 	armips boot9strap.s
 	python build_boot9strap_firm.py
 
 clean:
 	cd arm9_stage2 && $(MAKE) clean
 	rm -rf out
+	rm -rf build
diff --git a/boot9strap.s b/boot9strap.s
@@ -12,7 +12,7 @@ code_11_load_addr equ 0x1FF80000
 
 arm9mem_dabrt_loc equ 0x08000028
 
-.create "out/code9.bin",0x08000200
+.create "build/code9.bin",0x08000200
 
 .area 1F0h
 
@@ -119,7 +119,7 @@ ldr pc, [pc, #-0x4]
 .close
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-.create "out/code11.bin",code_11_load_addr
+.create "build/code11.bin",code_11_load_addr
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; boot11_hook: This code is called by boot11 just before lockout.
 ;              It copies the bootrom to axi_wram, then syncs with
@@ -205,7 +205,7 @@ bx lr
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; NDMA section: This generates the NDMA overwrite file.
 
-.create "out/NDMA.bin",0
+.create "build/NDMA.bin",0
 .area 200h
 .dw 0x00000000          ; NDMA Global CNT
 .dw dabrt_vector        ; Source Address
@@ -222,8 +222,8 @@ bx lr
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Data abort section: This is just a single sector causes boot9 to data abort.
 
-.create "out/dabrt.bin",0
+.create "build/dabrt.bin",0
 .area 200h
 .fill 0x200,0xFF
 .endarea
-.close
+.close
diff --git a/build_boot9strap_firm.py b/build_boot9strap_firm.py
@@ -4,7 +4,7 @@
 dev_perfect_signature = '88697CDCA9D1EA318256FCD9CED42964C1E98ABC6486B2F128EC02E71C5AE35D63D3BF1246134081AF68754787FCB922571D7F61A30DE4FCFA8293A9DA512396F1319A364968464CA9806E0A52567486754CDDD4C3A62BDCE255E0DEEC230129C1BAE1AE95D786865637C1E65FAE83EDF8E7B07D17C0AADA8F055B640D45AB0BAC76FF7B3439F5A4BFE8F7E0E103BCE995FAD913FB729D3D030B2644EC48396424E0563A1B3E6A1F680B39FC1461886FA7A60B6B56C5A846554AE648FC46E30E24678FAF1DC3CEB10C2A950F4FFA2083234ED8DCC3587A6D751A7E9AFA06156955084FF2725B698EB17454D9B02B6B76BE47ABBE206294366987A4CAB42CBD0B'
 
 def main(argc, argv):
-    sections = ['out/code11.bin', 'out/code9.bin', 'out/NDMA.bin', 'out/dabrt.bin']
+    sections = ['build/code11.bin', 'build/code9.bin', 'build/NDMA.bin', 'build/dabrt.bin']
     section_datas = []
     load_addresses = [0x1FF80000, 0x08000200, 0x10002000, 0xC0000000]
     for section in sections:
@@ -42,4 +42,4 @@ def main(argc, argv):
     print ('Successfully built out/boot9strap_dev.firm!')
 
 if __name__ == '__main__':
-    main(len(sys.argv), sys.argv)
+    main(len(sys.argv), sys.argv)