diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-03 23:53:33 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-03 23:53:33 -0700 |
| commit | dced12cbd2355604279c7277c8a48f584771dfb8 (patch) | |
| tree | e802b563faf47c06c9022d4cde0ce79631623b19 /common/nextpnr.h | |
| parent | 0a14e20f7332344d4c2f73c7ede54ef0258997f7 (diff) | |
| parent | f5a1b93f0e9348437ece7fb7d46ac69af98536d0 (diff) | |
| download | nextpnr-dced12cbd2355604279c7277c8a48f584771dfb8.tar.gz nextpnr-dced12cbd2355604279c7277c8a48f584771dfb8.tar.bz2 nextpnr-dced12cbd2355604279c7277c8a48f584771dfb8.zip | |
Merge branch 'master' into slack_histogram
Conflicts:
common/timing.cc
Diffstat (limited to 'common/nextpnr.h')
| -rw-r--r-- | common/nextpnr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index f49b982e..c87a98d9 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -472,7 +472,7 @@ struct Context : Arch, DeterministicRNG bool force = false; bool timing_driven = true; float target_freq = 12e6; - bool user_freq = false; + bool auto_freq = false; int slack_redist_iter = 0; Context(ArchArgs args) : Arch(args) {} |