From: Joshua Wise <joshua@nyus.joshuawise.com>
Date: Fri, 18 Apr 2008 04:45:19 +0000 (-0400)
Subject: Video RAM and a makefile change
X-Git-Url: http://git.joshuawise.com/fpgaboy.git/commitdiff_plain/2b7d78b5cb3dc569d3915e91b6fa5782c9b94ed7?ds=sidebyside

Video RAM and a makefile change
---

diff --git a/LCDC.v b/LCDC.v
index 05a46d5..444fb85 100644
--- a/LCDC.v
+++ b/LCDC.v
@@ -27,6 +27,16 @@ module LCDC(
 		clk4 = ~clk4;
 	assign lcdclk = clk4;
 	
+	/***** Video RAM *****/
+	/* Base is 0x8000
+	 *
+	 * Tile data from 8000-8FFF or 8800-97FF
+	 * Background tile maps 9800-9BFF or 9C00-9FFF
+	 */
+	reg [7:0] tiledata [6143:0];
+	reg [7:0] bgmap1 [1023:0];
+	reg [7:0] bgmap2 [1023:0];
+	
 	/***** LCD control registers *****/
 	reg [7:0] rLCDC = 8'h91;
 	reg [7:0] rSTAT = 8'h00;
diff --git a/Makefile b/Makefile
index 41e01c4..0aaf564 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ parsim: CoreTop_isim_par.exe
 	xlink tmp.lnk
 	rm tmp.lnk
 
-%.mem: %.bin
+%.mem: %.bin mashrom
 	./mashrom < $< > $@
 
 CoreTop_%.bit: %.mem CoreTop.bit foo_bd.bmm
diff --git a/impact.cmd b/impact.cmd
index 752fa2b..6cbed75 100644
--- a/impact.cmd
+++ b/impact.cmd
@@ -1,6 +1,6 @@
 setMode -bs
-setCable -port svf -file "XXX.svf"
-addDevice -p 1 -file "XXX.bit"
+setCable -port svf -file "/home/joshua/projects/fpga/FPGABoy/XXX.svf"
+addDevice -p 1 -file "/home/joshua/projects/fpga/FPGABoy/XXX.bit"
 addDevice -p 2 -part xcf04s
 Program -p 1 -defaultVersion 0
 quit
diff --git a/xst/projnav.tmp/.keep b/xst/projnav.tmp/.keep
deleted file mode 100644
index e69de29..0000000