diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-04-01 09:13:52 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-04-01 09:13:52 +0200 |
| commit | 7a4dd27b1b36e4e4667f31ee7b3c6e6bc3896f60 (patch) | |
| tree | 3e76c4069a6f8fa37e0f53f927738ed2a8665589 /techlibs | |
| parent | 25533190818b0fe207be9a4626a9a273a08ae219 (diff) | |
| parent | f277267916b7b1c97fe90576abecde003cc231ab (diff) | |
| download | yosys-7a4dd27b1b36e4e4667f31ee7b3c6e6bc3896f60.tar.gz yosys-7a4dd27b1b36e4e4667f31ee7b3c6e6bc3896f60.tar.bz2 yosys-7a4dd27b1b36e4e4667f31ee7b3c6e6bc3896f60.zip | |
Merge pull request #143 from azonenberg/master
Fixed several techmapping issues irelated to greenpak flipflops
Diffstat (limited to 'techlibs')
| -rw-r--r-- | techlibs/greenpak4/cells_map.v | 4 | ||||
| -rw-r--r-- | techlibs/greenpak4/greenpak4_counters.cc | 2 | ||||
| -rw-r--r-- | techlibs/greenpak4/synth_greenpak4.cc | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/techlibs/greenpak4/cells_map.v b/techlibs/greenpak4/cells_map.v index e24d24973..ce517d94b 100644 --- a/techlibs/greenpak4/cells_map.v +++ b/techlibs/greenpak4/cells_map.v @@ -5,7 +5,7 @@ module GP_DFFS(input D, CLK, nSET, output reg Q); .SRMODE(1'b1), ) _TECHMAP_REPLACE_ ( .D(D), - .CLK(C), + .CLK(CLK), .nSR(nSET), .Q(Q) ); @@ -18,7 +18,7 @@ module GP_DFFR(input D, CLK, nRST, output reg Q); .SRMODE(1'b0), ) _TECHMAP_REPLACE_ ( .D(D), - .CLK(C), + .CLK(CLK), .nSR(nRST), .Q(Q) ); diff --git a/techlibs/greenpak4/greenpak4_counters.cc b/techlibs/greenpak4/greenpak4_counters.cc index b79bf7d23..879e1fe88 100644 --- a/techlibs/greenpak4/greenpak4_counters.cc +++ b/techlibs/greenpak4/greenpak4_counters.cc @@ -1,7 +1,7 @@ /* * yosys -- Yosys Open SYnthesis Suite * - * Copyright (C) 2012 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2016 Clifford Wolf <clifford@clifford.at> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/techlibs/greenpak4/synth_greenpak4.cc b/techlibs/greenpak4/synth_greenpak4.cc index d44888998..25150ec56 100644 --- a/techlibs/greenpak4/synth_greenpak4.cc +++ b/techlibs/greenpak4/synth_greenpak4.cc @@ -102,6 +102,9 @@ struct SynthGreenPAK4Pass : public Pass { log(" dfflibmap -liberty +/greenpak4/gp_dff.lib\n"); log(" techmap -map +/greenpak4/cells_map.v\n"); log(" dffinit -ff GP_DFF Q INIT\n"); + log(" dffinit -ff GP_DFFR Q INIT\n"); + log(" dffinit -ff GP_DFFS Q INIT\n"); + log(" dffinit -ff GP_DFFSR Q INIT\n"); log(" clean\n"); log("\n"); log(" check:\n"); @@ -214,6 +217,9 @@ struct SynthGreenPAK4Pass : public Pass { Pass::call(design, "dfflibmap -liberty +/greenpak4/gp_dff.lib"); Pass::call(design, "techmap -map +/greenpak4/cells_map.v"); Pass::call(design, "dffinit -ff GP_DFF Q INIT"); + Pass::call(design, "dffinit -ff GP_DFFR Q INIT"); + Pass::call(design, "dffinit -ff GP_DFFS Q INIT"); + Pass::call(design, "dffinit -ff GP_DFFSR Q INIT"); Pass::call(design, "clean"); } |