3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-06-22 08:40:28 +00:00

Merge branch 'YosysHQ:main' into master

This commit is contained in:
Eder Monteiro 2025-10-28 22:57:27 -03:00 committed by GitHub
commit dd68612131
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 8 deletions

View file

@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
CXXFLAGS += -D_DEFAULT_SOURCE
endif
YOSYS_VER := 0.58+80
YOSYS_VER := 0.58+89
YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

View file

@ -28,6 +28,8 @@
# define WEXITSTATUS(x) ((x) & 0xff)
# define WTERMSIG(x) SIGTERM
# define WSTOPSIG(x) 0
#else
#include <sys/wait.h>
#endif
USING_YOSYS_NAMESPACE

View file

@ -79,8 +79,8 @@ module CC_SERDES #(
parameter [2:0] RX_AFE_VCMSEL = 4,
parameter [7:0] RX_CDR_CKP = 8'hF8,
parameter [7:0] RX_CDR_CKI = 0,
parameter [8:0] RX_CDR_TRANS_TH = 128,
parameter [5:0] RX_CDR_LOCK_CFG = 8'h0B,
parameter [6:0] RX_CDR_TRANS_TH = 7'h08,
parameter [7:0] RX_CDR_LOCK_CFG = 8'hD5,
parameter [14:0] RX_CDR_FREQ_ACC = 0,
parameter [15:0] RX_CDR_PHASE_ACC = 0,
parameter [1:0] RX_CDR_SET_ACC_CONFIG = 0,

View file

@ -19,8 +19,10 @@ ram block $__GOWIN_SP_ {
portoption "WRITE_MODE" 1 {
rdwr new;
}
portoption "WRITE_MODE" 2 {
rdwr old;
ifndef gw5a {
portoption "WRITE_MODE" 2 {
rdwr old;
}
}
}
}
@ -46,8 +48,10 @@ ram block $__GOWIN_DP_ {
portoption "WRITE_MODE" 1 {
rdwr new;
}
portoption "WRITE_MODE" 2 {
rdwr old;
ifndef gw5a {
portoption "WRITE_MODE" 2 {
rdwr old;
}
}
}
}

View file

@ -263,7 +263,7 @@ struct SynthGowinPass : public ScriptPass
if (nolutram)
args += " -no-auto-distributed";
}
run("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
run(stringf("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams.txt -D %s", family) + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
run(stringf("techmap -map +/gowin/lutrams_map.v -map +/gowin/brams_map%s.v", family == "gw5a" ? "_gw5a" : ""));
}