diff options
| author | David Shah <dave@ds0.me> | 2020-04-02 16:28:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 16:28:35 +0100 |
| commit | 38efbf5dea74798326a58e1bf6b9f678d9645986 (patch) | |
| tree | 1ee9da57c793de6a34e2998bf4ae6b54fb7c58b9 | |
| parent | 98e2f9ea8171bfb8cd04c74c4807dd21c1d18e85 (diff) | |
| parent | 707289c8d60161f9544a75e04166fefc9f656999 (diff) | |
| download | nextpnr-38efbf5dea74798326a58e1bf6b9f678d9645986.tar.gz nextpnr-38efbf5dea74798326a58e1bf6b9f678d9645986.tar.bz2 nextpnr-38efbf5dea74798326a58e1bf6b9f678d9645986.zip | |
Merge pull request #417 from hackfin/master
Enum/int compatibility for EHXPLLL parameters
| -rw-r--r-- | ecp5/bitstream.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index fd3de4ab..620add54 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -1253,9 +1253,14 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex tg.config.add_enum("FEEDBK_PATH", str_or_default(ci->params, ctx->id("FEEDBK_PATH"), "CLKOP")); tg.config.add_enum("CLKOP_TRIM_POL", str_or_default(ci->params, ctx->id("CLKOP_TRIM_POL"), "RISING")); - tg.config.add_enum("CLKOP_TRIM_DELAY", str_or_default(ci->params, ctx->id("CLKOP_TRIM_DELAY"), "0")); + + tg.config.add_enum("CLKOP_TRIM_DELAY", + intstr_or_default(ci->params, ctx->id("CLKOP_TRIM_DELAY"), "0")); + tg.config.add_enum("CLKOS_TRIM_POL", str_or_default(ci->params, ctx->id("CLKOS_TRIM_POL"), "RISING")); - tg.config.add_enum("CLKOS_TRIM_DELAY", str_or_default(ci->params, ctx->id("CLKOS_TRIM_DELAY"), "0")); + + tg.config.add_enum("CLKOS_TRIM_DELAY", + intstr_or_default(ci->params, ctx->id("CLKOS_TRIM_DELAY"), "0")); tg.config.add_enum("OUTDIVIDER_MUXA", str_or_default(ci->params, ctx->id("OUTDIVIDER_MUXA"), get_net_or_empty(ci, id_CLKOP) ? "DIVA" : "REFCLK")); |