Gowin. Fix merge.

Signed-off-by: YRabbit <[email protected]>
yrabbit · Sep 11, 2024 · 2f29b1c · 2f29b1c
1 parent 775292b
commit 2f29b1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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();