Subversion Repositories layer2

/trunk/sw/void/view.h

/trunk/sw/void/main.c

/trunk/sw/bin/data.vhd

/trunk/sw/common/Makefile

/trunk/xilinx/_ngo/netlist.lst File deleted

/trunk/xilinx/_ngo

trunk/xilinx/_ngo Property changes : Deleted: bugtraq:number ## -1 +0,0 ## -true \ No newline at end of property Index: trunk/xilinx/layer2.xise =================================================================== --- trunk/xilinx/layer2.xise (revision 3) +++ trunk/xilinx/layer2.xise (nonexistent) @@ -1,502 +0,0 @@ - - - -

- - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: trunk/xilinx/impact.cmds =================================================================== --- trunk/xilinx/impact.cmds (nonexistent) +++ trunk/xilinx/impact.cmds (revision 4) @@ -0,0 +1,6 @@ +setmode -bs +setcable -p auto +identify +assignFile -p 1 -file layer2.bit +program -p 1 +quit \ No newline at end of file Index: trunk/xilinx/layer2.ut =================================================================== --- trunk/xilinx/layer2.ut (nonexistent) +++ trunk/xilinx/layer2.ut (revision 4) @@ -0,0 +1,22 @@ +-w +-g DebugBitstream:No +-g Binary:no +-g CRC:Enable +-g ConfigRate:1 +-g ProgPin:PullUp +-g DonePin:PullUp +-g TckPin:PullUp +-g TdiPin:PullUp +-g TdoPin:PullUp +-g TmsPin:PullUp +-g UnusedPin:PullDown +-g UserID:0xFFFFFFFF +-g DCMShutdown:Disable +-g StartUpClk:CClk +-g DONE_cycle:4 +-g GTS_cycle:5 +-g GWE_cycle:6 +-g LCK_cycle:NoWait +-g Security:None +-g DonePipe:No +-g DriveDone:No Index: trunk/xilinx/layer2.prj =================================================================== --- trunk/xilinx/layer2.prj (nonexistent) +++ trunk/xilinx/layer2.prj (revision 4) @@ -0,0 +1,35 @@ +vhdl work "../vhdl/intercon/rtl/iwb.vhd" +vhdl work "../vhdl/cpu/rtl/mips1.vhd" +vhdl work "../vhdl/mem/rtl/imem.vhd" +vhdl work "../vhdl/cpu/rtl/tcpu.vhd" +vhdl work "../vhdl/vga/rtl/rom.vhd" +vhdl work "../vhdl/vga/rtl/ram.vhd" +vhdl work "../vhdl/rs232/rtl/iuart.vhd" +vhdl work "../vhdl/rs232/rtl/counter.vhd" +vhdl work "../vhdl/keyb/rtl/ps2.vhd" +vhdl work "../vhdl/keyb/rtl/ascii.vhd" +vhdl work "../vhdl/intercon/rtl/icon.vhd" +vhdl work "../vhdl/ddr/rtl/iddr.vhd" +vhdl work "../vhdl/ddr/rtl/ddr_init.vhd" +vhdl work "../vhdl/cpu/rtl/icpu.vhd" +vhdl work "../vhdl/cpu/rtl/gpr.vhd" +vhdl work "../vhdl/cpu/rtl/fcpu.vhd" +vhdl work "../sw/bin/data.vhd" +vhdl work "clock.vhd" +vhdl work "../vhdl/vga/rtl/vga.vhd" +vhdl work "../vhdl/vga/rtl/ivga.vhd" +vhdl work "../vhdl/rs232/rtl/uartt.vhd" +vhdl work "../vhdl/rs232/rtl/uartr.vhd" +vhdl work "../vhdl/pit/rtl/pit.vhd" +vhdl work "../vhdl/pit/rtl/ipit.vhd" +vhdl work "../vhdl/mem/rtl/mem.vhd" +vhdl work "../vhdl/keyb/rtl/keyb.vhd" +vhdl work "../vhdl/keyb/rtl/ikeyb.vhd" +vhdl work "../vhdl/intercon/rtl/intercon.vhd" +vhdl work "../vhdl/flash/rtl/iflash.vhd" +vhdl work "../vhdl/flash/rtl/flash.vhd" +vhdl work "../vhdl/ddr/rtl/ddr.vhd" +vhdl work "../vhdl/cpu/rtl/wbm.vhd" +vhdl work "../vhdl/cpu/rtl/iwbm.vhd" +vhdl work "../vhdl/cpu/rtl/cpu.vhd" +vhdl work "layer2.vhd" Index: trunk/xilinx/layer2.xst =================================================================== --- trunk/xilinx/layer2.xst (nonexistent) +++ trunk/xilinx/layer2.xst (revision 4) @@ -0,0 +1,56 @@ +set -tmpdir "xst/projnav.tmp" +set -xsthdpdir "xst" +run +-ifn layer2.prj +-ifmt mixed +-ofn layer2 +-ofmt NGC +-p xc3s500e-4-fg320 +-top layer2 +-opt_mode Speed +-opt_level 1 +-iuc NO +-keep_hierarchy No +-netlist_hierarchy As_Optimized +-rtlview Yes +-glob_opt AllClockNets +-read_cores YES +-write_timing_constraints NO +-cross_clock_analysis NO +-hierarchy_separator / +-bus_delimiter <> +-case Maintain +-slice_utilization_ratio 100 +-bram_utilization_ratio 100 +-verilog2001 YES +-fsm_extract YES -fsm_encoding Auto +-safe_implementation No +-fsm_style LUT +-ram_extract Yes +-ram_style Auto +-rom_extract Yes +-mux_style Auto +-decoder_extract YES +-priority_extract Yes +-shreg_extract YES +-shift_extract YES +-xor_collapse YES +-rom_style Auto +-auto_bram_packing NO +-mux_extract Yes +-resource_sharing YES +-async_to_sync NO +-mult_style Auto +-iobuf YES +-max_fanout 500 +-bufg 24 +-register_duplication YES +-register_balancing No +-slice_packing YES +-optimize_primitives NO +-use_clock_enable Yes +-use_sync_set Yes +-use_sync_reset Yes +-iob Auto +-equivalent_register_removal YES +-slice_utilization_ratio_maxmargin 5 Index: trunk/xilinx/Makefile =================================================================== --- trunk/xilinx/Makefile (nonexistent) +++ trunk/xilinx/Makefile (revision 4) @@ -0,0 +1,48 @@ +#------------------------------------------------------------------------------# +# Xilinx Makefile # +#------------------------------------------------------------------------------# +# Copyright (C) 2012 Mathias Hoertnagl, mathias.hoertnagl@gmail.com # +# # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; either version 3 of the License, or (at your option) # +# any later version. # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# You should have received a copy of the GNU General Public License along with # +# this program; if not, see . # +#------------------------------------------------------------------------------# +TOOL_DIR = /cygdrive/c/Xilinx/13.1/ISE_DS/ISE/bin/nt/ + +XST = $(TOOL_DIR)xst.exe +NGDBUILD = $(TOOL_DIR)ngdbuild.exe +MAP = $(TOOL_DIR)map.exe +PAR = $(TOOL_DIR)par.exe +TRCE = $(TOOL_DIR)trce.exe +BITGEN = $(TOOL_DIR)bitgen.exe +IMPACT = $(TOOL_DIR)impact.exe + +upload : layer2.bit + $(IMPACT) -batch impact.cmds + +.PHONY: build +build : layer2.bit + +layer2.bit : + $(XST) -ifn layer2.xst -ofn layer2.syr -intstyle ise + $(NGDBUILD) -intstyle ise -dd ngdbuild -nt timestamp -uc layer2.ucf \ + -p xc3s500e-fg320-4 layer2.ngc layer2.ngd + $(MAP) -intstyle ise -p xc3s500e-fg320-4 -cm area -ir off -pr off -c 100 \ + -o layer2_map.ncd layer2.ngd layer2.pcf + $(PAR) -w -intstyle ise -ol high -t 1 layer2_map.ncd layer2.ncd layer2.pcf + $(TRCE) -intstyle ise -v 3 -s 4 -n 3 -fastpaths -xml layer2.twx layer2.ncd \ + -o layer2.twr layer2.pcf -ucf layer2.ucf + $(BITGEN) -intstyle ise -f layer2.ut layer2.ncd + +.PHONY: clean +clean : + -@$(RM) *.bgn *.bld *.drc *.cmd_log *.lso *.ncd *.ngc *.ngd *.ngr *.pad \ + *.par *.pcf *.ptwx *.stx *.syr *.twr *.twx *.unroutes *.xpi *.xwbt \ + *.map *.mrp *.xrpt *.csv *.txt *.xml *.html *.log *.ngm \ No newline at end of file Index: trunk/xilinx =================================================================== --- trunk/xilinx (revision 3) +++ trunk/xilinx (revision 4)

trunk/xilinx Property changes : Added: svn:ignore ## -0,0 +1,6 ## +_ngo +_xmsgs +iseconfig +ngdbuild +xlnx_auto_0_xdb +xst Index: trunk/vhdl/ddr/rtl/ddr.vhd =================================================================== --- trunk/vhdl/ddr/rtl/ddr.vhd (revision 3) +++ trunk/vhdl/ddr/rtl/ddr.vhd (revision 4) @@ -172,7 +172,7 @@ -- If this problem happens to be fixed someday, the following state -- machine can be deleted and the Wishbone signals can be tied directly -- into the main state machine. - wbone : process(w, si, init.done) + wbone : process(w, si, init.done, ddr_done) begin win <= w; @@ -217,7 +217,7 @@ -- Main Controller -- ----------------------------------------------------------------------------- -- main : process(m, si, init) - main : process(m, init, read_wb, write_wb) + main : process(m, init, read_wb, write_wb, si.adr) begin min <= m;