grlib-gpl-1.2.1-b4122

Makefile

@@ -1,12 +1,2 @@
-ifndef ("$(GRLIB2)")
-ifdef  ("$(GRLIB)")
-GRLIB2 = $(GRLIB)
-else
-GRLIB2 = ./
-endif
-endif
-
 include bin/Makefile
-# GRLIB2
-#include bin/make.grlib2
-#include bin/make.housekeeping
+

bin/Makefile.config

@@ -1,127 +1,115 @@
-CONFDEP = $(GRLIB)/lib/techmap/clocks/clkgen.in \
-$(GRLIB)/lib/techmap/gencomp/tech.in \
-$(GRLIB)/lib/techmap/gencomp/clkgen.in \
-$(GRLIB)/lib/gleichmann/ac97/ac97_oc.in \
-$(GRLIB)/lib/gleichmann/multiio/multiio.in \
-$(GRLIB)/lib/gleichmann/ahb2hpi/ahb2hpi.in \
-$(GRLIB)/lib/gleichmann/spi/spi_oc.in \
-$(GRLIB)/lib/gleichmann/dac/adcdac.in \
-$(GRLIB)/lib/gleichmann/dac/dac_ahb.in \
-$(GRLIB)/lib/esa/memoryctrl/mctrl.in \
-$(GRLIB)/lib/esa/pci/pci_arb.in \
-$(GRLIB)/lib/praesum/ahbpassthru/ahbpassthru.in \
-$(GRLIB)/lib/gaisler/uart/dcom.in \
-$(GRLIB)/lib/gaisler/uart/uart2.in \
-$(GRLIB)/lib/gaisler/uart/uart1.in \
-$(GRLIB)/lib/gaisler/usb/grusbhc.in \
-$(GRLIB)/lib/gaisler/usb/grusb_dcl.in \
-$(GRLIB)/lib/gaisler/usb/grusbdc.in \
-$(GRLIB)/lib/gaisler/greth/greth.in \
-$(GRLIB)/lib/gaisler/greth/greth2.in \
-$(GRLIB)/lib/gaisler/spacewire/router.in \
-$(GRLIB)/lib/gaisler/spacewire/spacewire.in \
-$(GRLIB)/lib/gaisler/memctrl/sdctrl.in \
-$(GRLIB)/lib/gaisler/memctrl/srctrl.in \
-$(GRLIB)/lib/gaisler/memctrl/ssrctrl.in \
-$(GRLIB)/lib/gaisler/net/edcl.in \
-$(GRLIB)/lib/gaisler/ddr/mig.in \
-$(GRLIB)/lib/gaisler/ddr/ddr2sp.in \
-$(GRLIB)/lib/gaisler/ddr/ddrsp.in \
-$(GRLIB)/lib/gaisler/can/can_mc.in \
+CONFDEP = $(GRLIB)/lib/gaisler/leon3/irqmp.in \
+$(GRLIB)/lib/gaisler/leon3/leon3.in \
+$(GRLIB)/lib/gaisler/i2c/i2c.in \
+$(GRLIB)/lib/gaisler/i2c/i2cslv.in \
+$(GRLIB)/lib/gaisler/i2c/i2c2ahb.in \
 $(GRLIB)/lib/gaisler/can/can_oc.in \
 $(GRLIB)/lib/gaisler/can/grcan.in \
-$(GRLIB)/lib/gaisler/gr1553b/gr1553b.in \
-$(GRLIB)/lib/gaisler/gr1553b/gr1553b_2.in \
-$(GRLIB)/lib/gaisler/pci/pcitrace.in \
+$(GRLIB)/lib/gaisler/can/can_mc.in \
+$(GRLIB)/lib/gaisler/pci/pcidma.in \
+$(GRLIB)/lib/gaisler/pci/pci_target.in \
 $(GRLIB)/lib/gaisler/pci/pci_mtf.in \
+$(GRLIB)/lib/gaisler/pci/pcitrace.in \
 $(GRLIB)/lib/gaisler/pci/pci.in \
-$(GRLIB)/lib/gaisler/pci/pci_target.in \
-$(GRLIB)/lib/gaisler/pci/pcidma.in \
-$(GRLIB)/lib/gaisler/i2c/i2cslv.in \
-$(GRLIB)/lib/gaisler/i2c/i2c.in \
-$(GRLIB)/lib/gaisler/i2c/i2c2ahb.in \
-$(GRLIB)/lib/gaisler/ata/ata.in \
-$(GRLIB)/lib/gaisler/spi/spimctrl.in \
+$(GRLIB)/lib/gaisler/net/edcl.in \
 $(GRLIB)/lib/gaisler/spi/spictrl.in \
 $(GRLIB)/lib/gaisler/spi/spi2ahb.in \
+$(GRLIB)/lib/gaisler/spi/spimctrl.in \
+$(GRLIB)/lib/gaisler/greth/greth2.in \
+$(GRLIB)/lib/gaisler/greth/greth.in \
 $(GRLIB)/lib/gaisler/irqmp/irqmp.in \
-$(GRLIB)/lib/gaisler/misc/ahbram.in \
-$(GRLIB)/lib/gaisler/misc/ps2vga.in \
+$(GRLIB)/lib/gaisler/gr1553b/gr1553b.in \
+$(GRLIB)/lib/gaisler/gr1553b/gr1553b_2.in \
+$(GRLIB)/lib/gaisler/leon3ftv2/leon3net.in \
+$(GRLIB)/lib/gaisler/uart/uart2.in \
+$(GRLIB)/lib/gaisler/uart/dcom.in \
+$(GRLIB)/lib/gaisler/uart/uart1.in \
 $(GRLIB)/lib/gaisler/misc/gracectrl.in \
 $(GRLIB)/lib/gaisler/misc/ahbrom.in \
-$(GRLIB)/lib/gaisler/misc/grgpio2.in \
-$(GRLIB)/lib/gaisler/misc/gptimer.in \
-$(GRLIB)/lib/gaisler/misc/ps2.in \
-$(GRLIB)/lib/gaisler/misc/ahbstat.in \
 $(GRLIB)/lib/gaisler/misc/svgactrl.in \
 $(GRLIB)/lib/gaisler/misc/grgpio.in \
+$(GRLIB)/lib/gaisler/misc/ps2.in \
+$(GRLIB)/lib/gaisler/misc/gptimer.in \
+$(GRLIB)/lib/gaisler/misc/ps2vga.in \
+$(GRLIB)/lib/gaisler/misc/grgpio2.in \
+$(GRLIB)/lib/gaisler/misc/ahbstat.in \
 $(GRLIB)/lib/gaisler/misc/grsysmon.in \
-$(GRLIB)/lib/gaisler/jtag/jtag.in \
-$(GRLIB)/lib/gaisler/jtag/jtag2.in \
+$(GRLIB)/lib/gaisler/misc/ahbram.in \
+$(GRLIB)/lib/gaisler/usb/grusbhc.in \
+$(GRLIB)/lib/gaisler/usb/grusbdc.in \
+$(GRLIB)/lib/gaisler/usb/grusb_dcl.in \
+$(GRLIB)/lib/gaisler/spacewire/router.in \
+$(GRLIB)/lib/gaisler/spacewire/spacewire.in \
+$(GRLIB)/lib/gaisler/ddr/mig_series7.in \
+$(GRLIB)/lib/gaisler/ddr/mig.in \
+$(GRLIB)/lib/gaisler/ddr/ddrsp.in \
+$(GRLIB)/lib/gaisler/ddr/ddr2sp.in \
+$(GRLIB)/lib/gaisler/memctrl/sdctrl.in \
+$(GRLIB)/lib/gaisler/memctrl/ssrctrl.in \
+$(GRLIB)/lib/gaisler/memctrl/srctrl.in \
 $(GRLIB)/lib/gaisler/jtag/bscan.in \
-$(GRLIB)/lib/gaisler/leon3/leon3.in \
-$(GRLIB)/lib/gaisler/leon3/irqmp.in \
+$(GRLIB)/lib/gaisler/jtag/jtag2.in \
+$(GRLIB)/lib/gaisler/jtag/jtag.in \
+$(GRLIB)/lib/esa/pci/pci_arb.in \
+$(GRLIB)/lib/esa/memoryctrl/mctrl.in \
 $(GRLIB)/lib/grlib/amba/amba.in \
 $(GRLIB)/lib/grlib/util/debug.in \
+$(GRLIB)/lib/techmap/clocks/clkgen.in \
+$(GRLIB)/lib/techmap/gencomp/tech.in \
+$(GRLIB)/lib/techmap/gencomp/clkgen.in \
 
-HELPDEP = $(GRLIB)/lib/techmap/clocks/clkgen.in.help \
-$(GRLIB)/lib/techmap/gencomp/tech.in.help \
-$(GRLIB)/lib/techmap/gencomp/clkgen.in.help \
-$(GRLIB)/lib/gleichmann/ac97/ac97_oc.in.help \
-$(GRLIB)/lib/gleichmann/multiio/multiio.in.help \
-$(GRLIB)/lib/gleichmann/ahb2hpi/ahb2hpi.in.help \
-$(GRLIB)/lib/gleichmann/spi/spi_oc.in.help \
-$(GRLIB)/lib/gleichmann/dac/dac_ahb.in.help \
-$(GRLIB)/lib/gleichmann/dac/adcdac.in.help \
-$(GRLIB)/lib/esa/memoryctrl/mctrl.in.help \
-$(GRLIB)/lib/esa/pci/pci_arb.in.help \
-$(GRLIB)/lib/gaisler/uart/uart2.in.help \
-$(GRLIB)/lib/gaisler/uart/uart1.in.help \
-$(GRLIB)/lib/gaisler/uart/dcom.in.help \
-$(GRLIB)/lib/gaisler/usb/grusb_dcl.in.help \
-$(GRLIB)/lib/gaisler/usb/grusbdc.in.help \
-$(GRLIB)/lib/gaisler/usb/grusbhc.in.help \
-$(GRLIB)/lib/gaisler/greth/greth.in.help \
-$(GRLIB)/lib/gaisler/greth/greth2.in.help \
-$(GRLIB)/lib/gaisler/spacewire/spacewire.in.help \
-$(GRLIB)/lib/gaisler/spacewire/router.in.help \
-$(GRLIB)/lib/gaisler/memctrl/ssrctrl.in.help \
-$(GRLIB)/lib/gaisler/memctrl/sdctrl.in.help \
-$(GRLIB)/lib/gaisler/memctrl/srctrl.in.help \
-$(GRLIB)/lib/gaisler/net/edcl.in.help \
-$(GRLIB)/lib/gaisler/ddr/ddr2sp.in.help \
-$(GRLIB)/lib/gaisler/ddr/ddrsp.in.help \
+HELPDEP = $(GRLIB)/lib/gaisler/leon3/irqmp.in.help \
+$(GRLIB)/lib/gaisler/leon3/leon3.in.help \
+$(GRLIB)/lib/gaisler/i2c/i2cslv.in.help \
+$(GRLIB)/lib/gaisler/i2c/i2c.in.help \
+$(GRLIB)/lib/gaisler/i2c/i2c2ahb.in.help \
 $(GRLIB)/lib/gaisler/can/grcan.in.help \
 $(GRLIB)/lib/gaisler/can/can_mc.in.help \
 $(GRLIB)/lib/gaisler/can/can_oc.in.help \
-$(GRLIB)/lib/gaisler/gr1553b/gr1553b_2.in.help \
-$(GRLIB)/lib/gaisler/gr1553b/gr1553b.in.help \
 $(GRLIB)/lib/gaisler/pci/pcitrace.in.help \
 $(GRLIB)/lib/gaisler/pci/pci.in.help \
-$(GRLIB)/lib/gaisler/i2c/i2c.in.help \
-$(GRLIB)/lib/gaisler/i2c/i2cslv.in.help \
-$(GRLIB)/lib/gaisler/i2c/i2c2ahb.in.help \
-$(GRLIB)/lib/gaisler/ata/ata.in.help \
+$(GRLIB)/lib/gaisler/net/edcl.in.help \
 $(GRLIB)/lib/gaisler/spi/spimctrl.in.help \
 $(GRLIB)/lib/gaisler/spi/spi2ahb.in.help \
 $(GRLIB)/lib/gaisler/spi/spictrl.in.help \
+$(GRLIB)/lib/gaisler/greth/greth.in.help \
+$(GRLIB)/lib/gaisler/greth/greth2.in.help \
 $(GRLIB)/lib/gaisler/irqmp/irqmp.in.help \
-$(GRLIB)/lib/gaisler/misc/gracectrl.in.help \
-$(GRLIB)/lib/gaisler/misc/ahbram.in.help \
+$(GRLIB)/lib/gaisler/gr1553b/gr1553b_2.in.help \
+$(GRLIB)/lib/gaisler/gr1553b/gr1553b.in.help \
+$(GRLIB)/lib/gaisler/leon3ftv2/leon3net.in.help \
+$(GRLIB)/lib/gaisler/uart/uart2.in.help \
+$(GRLIB)/lib/gaisler/uart/dcom.in.help \
+$(GRLIB)/lib/gaisler/uart/uart1.in.help \
 $(GRLIB)/lib/gaisler/misc/gptimer.in.help \
-$(GRLIB)/lib/gaisler/misc/grgpio2.in.help \
+$(GRLIB)/lib/gaisler/misc/ps2vga.in.help \
 $(GRLIB)/lib/gaisler/misc/svgactrl.in.help \
+$(GRLIB)/lib/gaisler/misc/grsysmon.in.help \
+$(GRLIB)/lib/gaisler/misc/ahbstat.in.help \
 $(GRLIB)/lib/gaisler/misc/ahbrom.in.help \
 $(GRLIB)/lib/gaisler/misc/grgpio.in.help \
-$(GRLIB)/lib/gaisler/misc/ahbstat.in.help \
-$(GRLIB)/lib/gaisler/misc/ps2vga.in.help \
-$(GRLIB)/lib/gaisler/misc/grsysmon.in.help \
+$(GRLIB)/lib/gaisler/misc/gracectrl.in.help \
+$(GRLIB)/lib/gaisler/misc/grgpio2.in.help \
 $(GRLIB)/lib/gaisler/misc/ps2.in.help \
+$(GRLIB)/lib/gaisler/misc/ahbram.in.help \
+$(GRLIB)/lib/gaisler/usb/grusbhc.in.help \
+$(GRLIB)/lib/gaisler/usb/grusb_dcl.in.help \
+$(GRLIB)/lib/gaisler/usb/grusbdc.in.help \
+$(GRLIB)/lib/gaisler/spacewire/spacewire.in.help \
+$(GRLIB)/lib/gaisler/spacewire/router.in.help \
+$(GRLIB)/lib/gaisler/ddr/ddr2sp.in.help \
+$(GRLIB)/lib/gaisler/ddr/ddrsp.in.help \
+$(GRLIB)/lib/gaisler/memctrl/ssrctrl.in.help \
+$(GRLIB)/lib/gaisler/memctrl/srctrl.in.help \
+$(GRLIB)/lib/gaisler/memctrl/sdctrl.in.help \
+$(GRLIB)/lib/gaisler/jtag/jtag2.in.help \
 $(GRLIB)/lib/gaisler/jtag/jtag.in.help \
 $(GRLIB)/lib/gaisler/jtag/bscan.in.help \
-$(GRLIB)/lib/gaisler/jtag/jtag2.in.help \
-$(GRLIB)/lib/gaisler/leon3/irqmp.in.help \
-$(GRLIB)/lib/gaisler/leon3/leon3.in.help \
+$(GRLIB)/lib/esa/pci/pci_arb.in.help \
+$(GRLIB)/lib/esa/memoryctrl/mctrl.in.help \
 $(GRLIB)/lib/grlib/amba/amba.in.help \
 $(GRLIB)/lib/grlib/util/debug.in.help \
+$(GRLIB)/lib/techmap/clocks/clkgen.in.help \
+$(GRLIB)/lib/techmap/gencomp/tech.in.help \
+$(GRLIB)/lib/techmap/gencomp/clkgen.in.help \
 

bin/ahbrom.c

@@ -78,7 +78,6 @@ begin\n\
   ahbso.hresp   <= \"00\"; \n\
   ahbso.hsplit  <= (others => '0'); \n\
   ahbso.hirq    <= (others => '0');\n\
-  ahbso.hcache  <= '1';\n\
   ahbso.hconfig <= hconfig;\n\
   ahbso.hindex  <= hindex;\n\
 \n\

bin/gpl.sed

@@ -1,7 +1,7 @@
 s/--GAISLER_LICENSE/------------------------------------------------------------------------------\
 --  This file is a part of the GRLIB VHDL IP LIBRARY\
 --  Copyright (C) 2003 - 2008, Gaisler Research\
---  Copyright (C) 2008 - 2012, Aeroflex Gaisler\
+--  Copyright (C) 2008 - 2013, Aeroflex Gaisler\
 --\
 --  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\

bin/gr.sed

@@ -1,6 +1,6 @@
 s/--GAISLER_LICENSE/------------------------------------------------------------------------------\
 --  This file is a part of the GRLIB VHDL IP LIBRARY\
---  Copyright (C) 2012, Aeroflex Gaisler AB - all rights reserved.\
+--  Copyright (C) 2013, Aeroflex Gaisler AB - all rights reserved.\
 --\
 -- ANY USE OR REDISTRIBUTION IN PART OR IN WHOLE MUST BE HANDLED IN \
 -- ACCORDANCE WITH THE GAISLER LICENSE AGREEMENT AND MUST BE APPROVED \

boards/arrow-bemicro-sdk/leon3mp.qsf

@@ -5,6 +5,12 @@ set_global_assignment -name DEVICE_FILTER_PIN_COUNT 256
 set_global_assignment -name DEVICE_FILTER_SPEED_GRADE 7
 set_global_assignment -name NUM_PARALLEL_PROCESSORS 2
 set_global_assignment -name SDC_FILE quartus.sdc
+set_global_assignment -name CYCLONEII_RESERVE_NCEO_AFTER_CONFIGURATION "USE AS REGULAR IO"
+set_global_assignment -name RESERVE_FLASH_NCE_AFTER_CONFIGURATION "USE AS REGULAR IO"
+set_global_assignment -name RESERVE_DATA0_AFTER_CONFIGURATION "USE AS REGULAR IO"
+set_global_assignment -name RESERVE_DATA1_AFTER_CONFIGURATION "USE AS REGULAR IO"
+set_global_assignment -name RESERVE_DCLK_AFTER_CONFIGURATION "USE AS REGULAR IO"
+
 
 # PIN LOCATION ASSIGNMENTS
 set_location_assignment PIN_T4 -to TEMP_SC
@@ -148,6 +154,11 @@ set_location_assignment PIN_M10 -to P[29]
 set_location_assignment PIN_K15 -to P[58]
 set_location_assignment PIN_J14 -to P[59]
 set_location_assignment PIN_T7 -to P[60]
+set_location_assignment PIN_H2 -to EPCS_DATA
+set_location_assignment PIN_H1 -to EPCS_DCLK
+set_location_assignment PIN_D2 -to EPCS_CSn
+set_location_assignment PIN_C1 -to EPCS_ASDI
+
 
 # PIN I/O STANDARDS
 set_global_assignment -name STRATIX_DEVICE_IO_STANDARD "3.3-V LVTTL"

boards/digilent-zedboard-xc7z020/Makefile.inc

@@ -0,0 +1,28 @@
+# FPGA and Dev Board used in Design
+TECHNOLOGY=zynq7000
+PART=XC7Z020
+PACKAGE=CLG484
+PROTOBOARD=zedBoard
+SPEED=1
+
+# Set Vivado Synthesis Flow and Strategy used for build
+# Choose 'XST 14' or 'Vivado Synthesis 2012'
+PLANAHEAD_SYNTH_FLOW="XST 14"
+
+# For 'Vivado Synthesis 2012'
+#    1. 'Vivado Synthesis Defaults'
+# For 'XST 14'
+#    1. 'TimingWithIOBPacking'
+#    2. 'TimingWithoutIOBPacking'
+#    3. 'AreaReduction'
+#    4. 'PowerOptimization'
+#    5. 'XST Defaults'
+PLANAHEAD_SYNTH_STRATEGY="XST Defaults"
+
+# Set Vivado Implementation strategy
+#   1. HighEffort
+#   2. HighEffortPhySynth
+#   3. 'Vivado Implemnation Defaults'
+#   4. LowEffort
+#   5. QuickEffort
+PLANAHEAD_IMPL_STRATEGY="ParHighEffort"