diff options
Diffstat (limited to 'techlibs')
| -rw-r--r-- | techlibs/common/Makefile.inc | 7 | ||||
| -rw-r--r-- | techlibs/common/blackbox.sed | 5 | ||||
| -rw-r--r-- | techlibs/ice40/Makefile.inc | 5 | ||||
| -rw-r--r-- | techlibs/ice40/cells_sim.v | 3 | ||||
| -rw-r--r-- | techlibs/xilinx/Makefile.inc | 8 |
5 files changed, 4 insertions, 24 deletions
diff --git a/techlibs/common/Makefile.inc b/techlibs/common/Makefile.inc index d2ce61cf6..f222a0289 100644 --- a/techlibs/common/Makefile.inc +++ b/techlibs/common/Makefile.inc @@ -3,16 +3,9 @@ ifneq ($(SMALL),1) OBJS += techlibs/common/synth.o endif -EXTRA_TARGETS += techlibs/common/blackbox.v - -techlibs/common/blackbox.v: techlibs/common/blackbox.sed techlibs/common/simlib.v techlibs/common/simcells.v - $(P) cat techlibs/common/simlib.v techlibs/common/simcells.v | $(SED) -rf techlibs/common/blackbox.sed > techlibs/common/blackbox.v.new - $(Q) mv techlibs/common/blackbox.v.new techlibs/common/blackbox.v - $(eval $(call add_share_file,share,techlibs/common/simlib.v)) $(eval $(call add_share_file,share,techlibs/common/simcells.v)) $(eval $(call add_share_file,share,techlibs/common/techmap.v)) -$(eval $(call add_share_file,share,techlibs/common/blackbox.v)) $(eval $(call add_share_file,share,techlibs/common/pmux2mux.v)) $(eval $(call add_share_file,share,techlibs/common/adff2dff.v)) $(eval $(call add_share_file,share,techlibs/common/cells.lib)) diff --git a/techlibs/common/blackbox.sed b/techlibs/common/blackbox.sed deleted file mode 100644 index db8900344..000000000 --- a/techlibs/common/blackbox.sed +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sed -r -/^(wire|assign|reg|event|integer|localparam|\/\/|[\/ ]\*| *$|`)/ d; -/^(genvar|generate|always|initial|task|function)/,/^end/ d; -/^endmodule/ s/$/\n/; -s/ reg / /; diff --git a/techlibs/ice40/Makefile.inc b/techlibs/ice40/Makefile.inc index a9d2f2369..6907f0a0e 100644 --- a/techlibs/ice40/Makefile.inc +++ b/techlibs/ice40/Makefile.inc @@ -11,7 +11,7 @@ EXTRA_OBJS += techlibs/ice40/brams_init.mk .SECONDARY: techlibs/ice40/brams_init.mk techlibs/ice40/brams_init.mk: techlibs/ice40/brams_init.py - $(P) cd techlibs/ice40 && python brams_init.py + $(P) cd share/ice40 && python $< $(Q) touch techlibs/ice40/brams_init.mk techlibs/ice40/brams_init1.vh: techlibs/ice40/brams_init.mk @@ -23,7 +23,4 @@ $(eval $(call add_share_file,share/ice40,techlibs/ice40/cells_map.v)) $(eval $(call add_share_file,share/ice40,techlibs/ice40/cells_sim.v)) $(eval $(call add_share_file,share/ice40,techlibs/ice40/brams.txt)) $(eval $(call add_share_file,share/ice40,techlibs/ice40/brams_map.v)) -$(eval $(call add_share_file,share/ice40,techlibs/ice40/brams_init1.vh)) -$(eval $(call add_share_file,share/ice40,techlibs/ice40/brams_init2.vh)) -$(eval $(call add_share_file,share/ice40,techlibs/ice40/brams_init3.vh)) diff --git a/techlibs/ice40/cells_sim.v b/techlibs/ice40/cells_sim.v index ed7c7cd2d..17b6be9ce 100644 --- a/techlibs/ice40/cells_sim.v +++ b/techlibs/ice40/cells_sim.v @@ -866,8 +866,7 @@ endmodule // SiliconBlue Device Configuration Cells -(* blackbox *) -(* keep *) +(* blackbox, keep *) module SB_WARMBOOT ( input BOOT, input S1, diff --git a/techlibs/xilinx/Makefile.inc b/techlibs/xilinx/Makefile.inc index a8f5416e3..c6cf1a7d3 100644 --- a/techlibs/xilinx/Makefile.inc +++ b/techlibs/xilinx/Makefile.inc @@ -10,8 +10,8 @@ EXTRA_OBJS += techlibs/xilinx/brams_init.mk .SECONDARY: techlibs/xilinx/brams_init.mk techlibs/xilinx/brams_init.mk: techlibs/xilinx/brams_init.py - $(P) cd techlibs/xilinx && python brams_init.py - $(Q) touch techlibs/xilinx/brams_init.mk + $(P) cd share/xilinx && python $< + $(Q) touch $@ techlibs/xilinx/brams_init_36.vh: techlibs/xilinx/brams_init.mk techlibs/xilinx/brams_init_32.vh: techlibs/xilinx/brams_init.mk @@ -22,10 +22,6 @@ $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/cells_map.v)) $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/cells_sim.v)) $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/brams.txt)) $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/brams_map.v)) -$(eval $(call add_share_file,share/xilinx,techlibs/xilinx/brams_init_36.vh)) -$(eval $(call add_share_file,share/xilinx,techlibs/xilinx/brams_init_32.vh)) -$(eval $(call add_share_file,share/xilinx,techlibs/xilinx/brams_init_18.vh)) -$(eval $(call add_share_file,share/xilinx,techlibs/xilinx/brams_init_16.vh)) $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/brams_bb.v)) $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/drams.txt)) $(eval $(call add_share_file,share/xilinx,techlibs/xilinx/drams_map.v)) |