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

ecp5: Make target device 45k on account of current hardware access

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-07-08 18:36:59 +02:00
parent 54f06fdf72
commit de82ecad59
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ecp5/arch.cc
View File

@ -92,16 +92,16 @@ static const ChipInfoPOD *get_chip_info(const RelPtr<ChipInfoPOD> *ptr) { return
void load_chipdb(); void load_chipdb();
#endif #endif
#define LFE5U_25F_ONLY #define LFE5U_45F_ONLY
Arch::Arch(ArchArgs args) : args(args) Arch::Arch(ArchArgs args) : args(args)
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER)
load_chipdb(); load_chipdb();
#endif #endif
#ifdef LFE5U_25F_ONLY #ifdef LFE5U_45F_ONLY
if (args.type == ArchArgs::LFE5U_25F) { if (args.type == ArchArgs::LFE5U_45F) {
chip_info = get_chip_info(reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_25k)); chip_info = get_chip_info(reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_45k));
} else { } else {
log_error("Unsupported ECP5 chip type.\n"); log_error("Unsupported ECP5 chip type.\n");
} }

2
ecp5/family.cmake
View File

@ -1,5 +1,5 @@
set(devices 25k) set(devices 45k)
set(DB_PY ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/trellis_import.py) set(DB_PY ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/trellis_import.py)

4
ecp5/main.cc
View File

@ -108,7 +108,7 @@ int main(int argc, char *argv[])
Trellis::load_database(TRELLIS_ROOT "/database"); Trellis::load_database(TRELLIS_ROOT "/database");
ArchArgs args; ArchArgs args;
args.type = ArchArgs::LFE5U_25F; args.type = ArchArgs::LFE5U_45F;
args.package = "CABGA381"; args.package = "CABGA381";
args.speed = 6; args.speed = 6;
Context ctx(args); Context ctx(args);
@ -149,7 +149,7 @@ int main(int argc, char *argv[])
log_error("Routing design failed.\n"); log_error("Routing design failed.\n");
// TEST BEGIN // TEST BEGIN
Trellis::Chip c("LFE5U-25F"); Trellis::Chip c("LFE5U-45F");
for (auto pip : ctx.getPips()) { for (auto pip : ctx.getPips()) {
if (!ctx.checkPipAvail(pip)) { if (!ctx.checkPipAvail(pip)) {
auto tile = c.get_tile_by_position_and_type(pip.location.y, pip.location.x, ctx.getPipTiletype(pip)); auto tile = c.get_tile_by_position_and_type(pip.location.y, pip.location.x, ctx.getPipTiletype(pip));