From 80705e9bbba4028077ae9abfdb86ba6b4b06a5eb Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 16 Mar 2023 17:34:52 +0100 Subject: [PATCH] Support enabling XO3 and XO3D --- machxo2/CMakeLists.txt | 10 +++++----- machxo2/facade_import.py | 22 ++++++++++++++++++++-- machxo2/family.cmake | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/machxo2/CMakeLists.txt b/machxo2/CMakeLists.txt index 414c6571..7cfe5b33 100644 --- a/machxo2/CMakeLists.txt +++ b/machxo2/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) project(chipdb-machxo2 NONE) -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}") +set(ALL_MACHXO2_DEVICES 256X 640X 1200X 2280X 256 640 1200 2000 4000 7000 1300 2100 4300 6900 9400 4300D 9400D) +set(MACHXO2_DEVICES 1200 6900 CACHE STRING + "Include support for these MachXO2/XO3 devices (available: ${ALL_MACHXO2_DEVICES})") +message(STATUS "Enabled MachXO2/XO3 devices: ${MACHXO2_DEVICES}") if(DEFINED MACHXO2_CHIPDB) add_custom_target(chipdb-machxo2-bbas ALL) @@ -51,7 +51,7 @@ else() file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/chipdb) foreach(device ${MACHXO2_DEVICES}) if(NOT device IN_LIST ALL_MACHXO2_DEVICES) - message(FATAL_ERROR "Device ${device} is not a supported MachXO2 device") + message(FATAL_ERROR "Device ${device} is not a supported MachXO2/XO3 device") endif() set(device_bba chipdb/chipdb-${device}.bba) diff --git a/machxo2/facade_import.py b/machxo2/facade_import.py index fdb0f723..9d0b5ed9 100644 --- a/machxo2/facade_import.py +++ b/machxo2/facade_import.py @@ -422,7 +422,16 @@ dev_family = { "1200": "MachXO2", "2000": "MachXO2", "4000": "MachXO2", - "7000": "MachXO2" + "7000": "MachXO2", + + "1300": "MachXO3", + "2100": "MachXO3", + "4300": "MachXO3", + "6900": "MachXO3", + "9400": "MachXO3", + + "4300D": "MachXO3D", + "9400D": "MachXO3D" } dev_names = { @@ -436,7 +445,16 @@ dev_names = { "1200": "LCMXO2-1200", "2000": "LCMXO2-2000", "4000": "LCMXO2-4000", - "7000": "LCMXO2-7000" + "7000": "LCMXO2-7000", + + "1300": "LCMXO3-1300", + "2100": "LCMXO3-2100", + "4300": "LCMXO3-4300", + "6900": "LCMXO3-6900", + "9400": "LCMXO3-9400", + + "4300D": "LCMXO3D-4300", + "9400D": "LCMXO3D-9400" } def main(): diff --git a/machxo2/family.cmake b/machxo2/family.cmake index 604c91f3..30fd42ba 100644 --- a/machxo2/family.cmake +++ b/machxo2/family.cmake @@ -1,5 +1,5 @@ add_subdirectory(${family}) -message(STATUS "Using MachXO2 chipdb: ${MACHXO2_CHIPDB}") +message(STATUS "Using MachXO2/XO3 chipdb: ${MACHXO2_CHIPDB}") set(chipdb_sources) set(chipdb_binaries)