diff options
| author | Clifford Wolf <clifford@clifford.at> | 2015-08-13 09:52:06 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2015-08-13 09:52:06 +0200 |
| commit | 80910d13a610886f4430fbd991ada78b2e586ada (patch) | |
| tree | c582d1b1394600030c8bd88a8ec4a3b25178fa1f /techlibs/ice40 | |
| parent | c699d7c6145f978b1864c2be25d9f0607099a3e5 (diff) | |
| parent | 698357dd9a17365566f4db2662e9ce9fea7594c4 (diff) | |
| download | yosys-80910d13a610886f4430fbd991ada78b2e586ada.tar.gz yosys-80910d13a610886f4430fbd991ada78b2e586ada.tar.bz2 yosys-80910d13a610886f4430fbd991ada78b2e586ada.zip | |
Merge branch 'master' of github.com:cliffordwolf/yosys
Diffstat (limited to 'techlibs/ice40')
| -rw-r--r-- | techlibs/ice40/Makefile.inc | 5 | ||||
| -rw-r--r-- | techlibs/ice40/cells_sim.v | 3 |
2 files changed, 2 insertions, 6 deletions
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, |