caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gowin. Fix merge.

Browse Source 
Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
This commit is contained in:
YRabbit 2024-09-11 19:45:19 +10:00
parent 775292b917
commit 2f29b1c32e
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
himbaechel/uarch/gowin/gowin.h
View File

@ -177,7 +177,6 @@ enum
VSS_Z = 278, VSS_Z = 278,
BANDGAP_Z = 279, BANDGAP_Z = 279,
DQCE_Z = 280, // : 286 reserve for 6 DQCEs DQCE_Z = 280, // : 286 reserve for 6 DQCEs
DCS_Z = 286, // : 288 reserve for 2 DCSs DCS_Z = 286, // : 288 reserve for 2 DCSs
DHCEN_Z = 288, // : 298 DHCEN_Z = 288, // : 298

8
himbaechel/uarch/gowin/pack.cc
View File

@ -3094,7 +3094,7 @@ struct GowinPacker
if (grab_bels) { if (grab_bels) {
// sane message if new primitives are used with old bases // sane message if new primitives are used with old bases
auto buckets = ctx->getBelBuckets(); 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."); "There are no DHCEN bels to use.");
int i = 0; int i = 0;
for (auto &bel : ctx->getBelsInBucket(ctx->getBelBucketForCellType(id_DHCEN))) { for (auto &bel : ctx->getBelsInBucket(ctx->getBelBucketForCellType(id_DHCEN))) {
@ -3362,14 +3362,10 @@ struct GowinPacker
pack_buffered_nets(); pack_buffered_nets();
ctx->check(); ctx->check();
<<<<<<< cpu-wip
pack_emcu_and_flash(); pack_emcu_and_flash();
=======
pack_dhcens();
ctx->check(); ctx->check();
pack_userflash(); pack_dhcens();
>>>>>>> master
ctx->check(); ctx->check();
pack_dqce(); pack_dqce();