X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/7541ec1789a729ac97d5f32e4d9360a42c759668..65d3506eebbdc5ae3e52c112b0ef74e447553586:/Makefile

diff --git a/Makefile b/Makefile
index 3a508ae..2779109 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,29 @@
-VLOGS = 7seg.v Framebuffer.v GBZ80Core.v Interrupt.v LCDC.v Sound1.v \
-	Sound2.v Soundcore.v System.v Timer.v Uart.v
-
-VLOGS_ALL = $(VLOGS) insn_call-callcc.v insn_incdec16.v insn_jr-jrcc.v \
-	insn_ld_reg_hl.v insn_ld_reg_reg.v insn_nop.v insn_ret-retcc.v \
-	allinsns.v insn_alu8.v insn_di-ei.v insn_jp_hl.v insn_ldh_ac.v \
-	insn_ld_reg_imm16.v insn_ld_sp_hl.v insn_pop_reg.v insn_rst.v \
-	CPUDCM.v insn_alu_a.v insn_halt.v insn_jp-jpcc.v insn_ld_hl_reg.v \
-	insn_ld_reg_imm8.v insn_ldx_ahl.v insn_push_reg.v insn_vop_intr.v \
-	insn_ldm8_a.v insn_ldm16_a.v insn_ldbcde_a.v insn_alu_ext.v \
-	insn_bit.v insn_two_byte.v insn_incdec_reg8.v
-
-all: CoreTop_rom.svf CoreTop_diag.svf CoreTop_bootrom.svf CoreTop.twr
+VLOGS = 7seg.v Framebuffer.v core/GBZ80Core.v Interrupt.v LCDC.v Sound1.v \
+	Sound2.v Soundcore.v System.v Timer.v Uart.v Buttons.v PS2Button.v
+
+VLOGS_ALL = $(VLOGS) core/insn_call-callcc.v core/insn_incdec16.v \
+	core/insn_jr-jrcc.v core/insn_ld_reg_hl.v core/insn_ld_reg_reg.v \
+	core/insn_nop.v core/insn_ret-retcc.v core/allinsns.v \
+	core/insn_alu8.v core/insn_di-ei.v core/insn_jp_hl.v \
+	core/insn_ldh_ac.v core/insn_ld_reg_imm16.v core/insn_ld_sp_hl.v \
+	core/insn_pop_reg.v core/insn_rst.v CPUDCM.v core/insn_alu_a.v \
+	core/insn_halt.v core/insn_jp-jpcc.v core/insn_ld_hl_reg.v \
+	core/insn_ld_reg_imm8.v core/insn_ldx_ahl.v core/insn_push_reg.v \
+	core/insn_vop_intr.v core/insn_ldm8_a.v core/insn_ldm16_a.v \
+	core/insn_ldbcde_a.v core/insn_alu_ext.v core/insn_bit.v \
+	core/insn_two_byte.v core/insn_incdec_reg8.v core/insn_add_hl.v \
+	core/insn_add_sp_imm8.v core/insn_ldhl_sp_imm8.v core/insn_ld_nn_sp.v \
+	core/insn_setres.v
+
+all: CoreTop.svf
 
 sim: CoreTop_isim.exe
 
-CoreTop.ngc: CoreTop.xst CoreTop.prj $(VLOGS_ALL)
+CoreTop.ngc: CoreTop.xst CoreTop.prj $(VLOGS_ALL) fpgaboot.hex gbboot.hex
 	xst -ifn CoreTop.xst -ofn CoreTop.syr
 
 CoreTop.ngd: CoreTop.ngc foo.bmm CoreTop.ucf
-	ngdbuild -dd _ngo -uc CoreTop.ucf -nt timestamp -bm "foo.bmm" -p xc3s500e-fg320-5 "CoreTop.ngc" CoreTop.ngd
+	ngdbuild -dd _ngo -uc CoreTop.ucf -nt timestamp -p xc3s500e-fg320-5 "CoreTop.ngc" CoreTop.ngd
 
 CoreTop_map.ncd: CoreTop.ngd
 	map -p xc3s500e-fg320-5 -cm area -pr off -k 4 -c 100 -o CoreTop_map.ncd CoreTop.ngd CoreTop.pcf
@@ -63,10 +68,11 @@ parsim: CoreTop_isim_par.exe
 %.mem: %.bin mashrom
 	./mashrom < $< > $@
 
-CoreTop_%.bit: %.mem CoreTop.bit foo_bd.bmm
-	data2mem -bm foo_bd.bmm -bd $< -bt CoreTop.bit -o b $@
+fpgaboot.hex: fpgaboot.bin mashrom
+	./mashrom 256 < $< > $@
+
 
-CoreTop_%.svf: CoreTop_%.bit impact.cmd
+CoreTop.svf: CoreTop.bit impact.cmd
 	sed -e s/XXX/$(subst .bit,,$<)/ < impact.cmd > tmp.cmd
 	impact -batch tmp.cmd