From 18ad718e53daa836e15eaa3f61da428f286fbd54 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 8 Mar 2023 11:50:06 +0100 Subject: Expand list of possible devices --- machxo2/CMakeLists.txt | 3 +-- machxo2/facade_import.py | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/machxo2/CMakeLists.txt b/machxo2/CMakeLists.txt index f772f801..4d54f2fa 100644 --- a/machxo2/CMakeLists.txt +++ b/machxo2/CMakeLists.txt @@ -1,8 +1,7 @@ cmake_minimum_required(VERSION 3.5) project(chipdb-machxo2 NONE) -# set(ALL_MACHXO2_DEVICES 256 640 1200 2000 4000 7000) -set(ALL_MACHXO2_DEVICES 1200) +set(ALL_MACHXO2_DEVICES 256X 640X 1200X 2280X 256 640 1200 2000 4000 7000) set(MACHXO2_DEVICES 1200 CACHE STRING "Include support for these MachXO2 devices (available: ${ALL_MACHXO2_DEVICES})") message(STATUS "Enabled MachXO2 devices: ${MACHXO2_DEVICES}") diff --git a/machxo2/facade_import.py b/machxo2/facade_import.py index 5bb2d78b..4a33c210 100644 --- a/machxo2/facade_import.py +++ b/machxo2/facade_import.py @@ -92,7 +92,7 @@ packages = {} pindata = [] def process_pio_db(rg, device): - piofile = path.join(database.get_db_root(), "MachXO2", dev_names[device], "iodb.json") + piofile = path.join(database.get_db_root(), dev_family[device], dev_names[device], "iodb.json") with open(piofile, 'r') as f: piodb = json.load(f) for pkgname, pkgdata in sorted(piodb["packages"].items()): @@ -330,7 +330,33 @@ def write_database(dev_name, chip, rg, endianness): bba.pop() -dev_names = {"1200": "LCMXO2-1200HC"} +dev_family = { + "256X": "MachXO", + "640X": "MachXO", + "1200X":"MachXO", + "2280X":"MachXO", + + "256": "MachXO2", + "640": "MachXO2", + "1200": "MachXO2", + "2000": "MachXO2", + "4000": "MachXO2", + "7000": "MachXO2" +} + +dev_names = { + "256X": "LCMXO256", + "640X": "LCMXO640", + "1200X":"LCMXO1200", + "2280X":"LCMXO2280", + + "256": "LCMXO2-256", + "640": "LCMXO2-640", + "1200": "LCMXO2-1200", + "2000": "LCMXO2-2000", + "4000": "LCMXO2-4000", + "7000": "LCMXO2-7000" +} def main(): global max_row, max_col, const_id_count -- cgit v1.2.3