Video RAM and a makefile change

diff --git a/LCDC.v b/LCDC.v
index 05a46d5cfab751054e53f5f2dc3d5f4b31bb37aa..444fb85b02792a7055e84f49fe356b87e2563654 100644 (file)
--- a/LCDC.v
+++ b/LCDC.v
@@ -27,6 +27,16 @@ module LCDC(
                clk4 = ~clk4;
        assign lcdclk = clk4;
        
                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;
        /***** LCD control registers *****/
        reg [7:0] rLCDC = 8'h91;
        reg [7:0] rSTAT = 8'h00;

diff --git a/Makefile b/Makefile
index 41e01c4e94a8f69f9a98e57e899de10a1c719023..0aaf564fa1c874841d649f1bd29375cc4cb2a6e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ parsim: CoreTop_isim_par.exe
        xlink tmp.lnk
        rm tmp.lnk
 
        xlink tmp.lnk
        rm tmp.lnk
 

-%.mem: %.bin
+%.mem: %.bin mashrom

        ./mashrom < $< > $@
 
 CoreTop_%.bit: %.mem CoreTop.bit foo_bd.bmm
        ./mashrom < $< > $@
 
 CoreTop_%.bit: %.mem CoreTop.bit foo_bd.bmm

diff --git a/impact.cmd b/impact.cmd
index 752fa2baf41d92226b7113c3853dcc65b57dd85c..6cbed753603c882718ab2979cc152be200da7346 100644 (file)
--- a/impact.cmd
+++ b/impact.cmd
@@ -1,6 +1,6 @@
 setMode -bs
 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
 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 (file)
index e69de29..0000000