Gowin. Fix merge.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
2024-09-11 19:45:19 +10:00 · 2024-09-11 19:45:19 +10:00 · 2f29b1c32e
commit 2f29b1c32e
parent 775292b917
2 changed files with 2 additions and 7 deletions
--- 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
--- a/himbaechel/uarch/gowin/pack.cc
+++ b/himbaechel/uarch/gowin/pack.cc
@ -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();