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

Merge pull request #909 from pepijndevos/mygw1n9c

Browse Source 
Add support for GW1N-9C and --family argument
This commit is contained in:
gatecat 2022-02-06 14:19:02 +00:00 committed by GitHub
commit dad0ef4ab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus/Dockerfile.ubuntu20.04
View File

@ -65,4 +65,4 @@ RUN set -e -x ;\
PATH=$PATH:$HOME/.cargo/bin cargo install --path prjoxide PATH=$PATH:$HOME/.cargo/bin cargo install --path prjoxide
RUN set -e -x ;\ RUN set -e -x ;\
pip3 install apycula==0.2a2 pip3 install apycula==0.2a3

2
gowin/CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
project(chipdb-gowin NONE) project(chipdb-gowin NONE)
set(ALL_GOWIN_DEVICES GW1N-1 GW1N-4 GW1N-9 GW1NS-2 GW1NS-4) set(ALL_GOWIN_DEVICES GW1N-1 GW1N-4 GW1N-9 GW1N-9C GW1NS-2 GW1NS-4)
set(GOWIN_DEVICES ${ALL_GOWIN_DEVICES} CACHE STRING set(GOWIN_DEVICES ${ALL_GOWIN_DEVICES} CACHE STRING
"Include support for these Gowin devices (available: ${ALL_GOWIN_DEVICES})") "Include support for these Gowin devices (available: ${ALL_GOWIN_DEVICES})")
message(STATUS "Enabled Gowin devices: ${GOWIN_DEVICES}") message(STATUS "Enabled Gowin devices: ${GOWIN_DEVICES}")

17
gowin/main.cc
View File

@ -48,6 +48,7 @@ po::options_description GowinCommandHandler::getArchOptions()
{ {
po::options_description specific("Architecture specific options"); po::options_description specific("Architecture specific options");
specific.add_options()("device", po::value<std::string>(), "device name"); specific.add_options()("device", po::value<std::string>(), "device name");
specific.add_options()("family", po::value<std::string>(), "family name");
specific.add_options()("cst", po::value<std::string>(), "physical constraints file"); specific.add_options()("cst", po::value<std::string>(), "physical constraints file");
return specific; return specific;
} }
@ -62,12 +63,16 @@ std::unique_ptr<Context> GowinCommandHandler::createContext(dict<std::string, Pr
} }
ArchArgs chipArgs; ArchArgs chipArgs;
chipArgs.gui = vm.count("gui") != 0; chipArgs.gui = vm.count("gui") != 0;
char buf[36]; if (vm.count("family")) {
// GW1N and GW1NR variants share the same database. chipArgs.family = vm["family"].as<std::string>();
// Most Gowin devices are a System in Package with some SDRAM wirebonded to a GPIO bank. } else {
// However, it appears that the S series with embedded ARM core are unique silicon. char buf[36];
snprintf(buf, 36, "GW1N%s-%s", match[1].str().c_str(), match[3].str().c_str()); // GW1N and GW1NR variants share the same database.
chipArgs.family = buf; // Most Gowin devices are a System in Package with some SDRAM wirebonded to a GPIO bank.
// However, it appears that the S series with embedded ARM core are unique silicon.
snprintf(buf, 36, "GW1N%s-%s", match[1].str().c_str(), match[3].str().c_str());
chipArgs.family = buf;
}
chipArgs.partnumber = match[0]; chipArgs.partnumber = match[0];
return std::unique_ptr<Context>(new Context(chipArgs)); return std::unique_ptr<Context>(new Context(chipArgs));
} }