From 2f29b1c32e17d3aef001d789fe92639b79f2c0c8 Mon Sep 17 00:00:00 2001 From: YRabbit Date: Wed, 11 Sep 2024 19:45:19 +1000 Subject: [PATCH] Gowin. Fix merge. Signed-off-by: YRabbit --- himbaechel/uarch/gowin/gowin.h | 1 - himbaechel/uarch/gowin/pack.cc | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/himbaechel/uarch/gowin/gowin.h b/himbaechel/uarch/gowin/gowin.h index 66c729b72d..1588b27b91 100644 --- a/himbaechel/uarch/gowin/gowin.h +++ b/himbaechel/uarch/gowin/gowin.h @@ -177,7 +177,6 @@ enum VSS_Z = 278, BANDGAP_Z = 279, - DQCE_Z = 280, // : 286 reserve for 6 DQCEs DCS_Z = 286, // : 288 reserve for 2 DCSs DHCEN_Z = 288, // : 298 diff --git a/himbaechel/uarch/gowin/pack.cc b/himbaechel/uarch/gowin/pack.cc index 2dabd5e33d..78389d7fd7 100644 --- a/himbaechel/uarch/gowin/pack.cc +++ b/himbaechel/uarch/gowin/pack.cc @@ -3094,7 +3094,7 @@ struct GowinPacker if (grab_bels) { // sane message if new primitives are used with old bases auto buckets = ctx->getBelBuckets(); - NPNR_ASSERT_MSG(std::find(buckets.begin(), buckets.end(), id_DHCEN) != buckets.end(), + NPNR_ASSERT_MSG(std::find(buckets.begin(), buckets.end(), id_DHCEN) != buckets.end(), "There are no DHCEN bels to use."); int i = 0; for (auto &bel : ctx->getBelsInBucket(ctx->getBelBucketForCellType(id_DHCEN))) { @@ -3362,14 +3362,10 @@ struct GowinPacker pack_buffered_nets(); ctx->check(); -<<<<<<< cpu-wip pack_emcu_and_flash(); -======= - pack_dhcens(); ctx->check(); - pack_userflash(); ->>>>>>> master + pack_dhcens(); ctx->check(); pack_dqce();