aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--mistral/arch.cc (renamed from cyclonev/arch.cc)0
-rw-r--r--mistral/arch.h (renamed from cyclonev/arch.h)0
-rw-r--r--mistral/archdefs.h (renamed from cyclonev/archdefs.h)0
-rw-r--r--mistral/constids.inc (renamed from cyclonev/constids.inc)0
-rw-r--r--mistral/family.cmake (renamed from cyclonev/family.cmake)4
-rw-r--r--mistral/io.cc (renamed from cyclonev/io.cc)0
-rw-r--r--mistral/lab.cc (renamed from cyclonev/lab.cc)0
-rw-r--r--mistral/main.cc (renamed from cyclonev/main.cc)0
9 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d007ff7..233d5797 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,9 +95,9 @@ endif()
set(PROGRAM_PREFIX "" CACHE STRING "Name prefix for executables")
# List of families to build
-set(FAMILIES generic ice40 ecp5 nexus gowin fpga_interchange machxo2 cyclonev)
+set(FAMILIES generic ice40 ecp5 nexus gowin fpga_interchange machxo2 mistral)
set(STABLE_FAMILIES generic ice40 ecp5)
-set(EXPERIMENTAL_FAMILIES nexus gowin fpga_interchange machxo2 cyclonev)
+set(EXPERIMENTAL_FAMILIES nexus gowin fpga_interchange machxo2 mistral)
set(ARCH "" CACHE STRING "Architecture family for nextpnr build")
set_property(CACHE ARCH PROPERTY STRINGS ${FAMILIES})
diff --git a/cyclonev/arch.cc b/mistral/arch.cc
index fd2f345d..fd2f345d 100644
--- a/cyclonev/arch.cc
+++ b/mistral/arch.cc
diff --git a/cyclonev/arch.h b/mistral/arch.h
index ff006881..ff006881 100644
--- a/cyclonev/arch.h
+++ b/mistral/arch.h
diff --git a/cyclonev/archdefs.h b/mistral/archdefs.h
index 0f8f5a12..0f8f5a12 100644
--- a/cyclonev/archdefs.h
+++ b/mistral/archdefs.h
diff --git a/cyclonev/constids.inc b/mistral/constids.inc
index c4af45e6..c4af45e6 100644
--- a/cyclonev/constids.inc
+++ b/mistral/constids.inc
diff --git a/cyclonev/family.cmake b/mistral/family.cmake
index 92ec7d12..441d81db 100644
--- a/cyclonev/family.cmake
+++ b/mistral/family.cmake
@@ -1,7 +1,7 @@
set(MISTRAL_ROOT "" CACHE STRING "Mistral install path")
-aux_source_directory(${MISTRAL_ROOT}/lib MISTRAL_FILES)
-add_library(mistral STATIC ${MISTRAL_FILES})
+aux_source_directory(${MISTRAL_ROOT}/lib MISTRAL_LIB_FILES)
+add_library(mistral STATIC ${MISTRAL_LIB_FILES})
find_package(LibLZMA REQUIRED)
diff --git a/cyclonev/io.cc b/mistral/io.cc
index f2517e5d..f2517e5d 100644
--- a/cyclonev/io.cc
+++ b/mistral/io.cc
diff --git a/cyclonev/lab.cc b/mistral/lab.cc
index 1f117106..1f117106 100644
--- a/cyclonev/lab.cc
+++ b/mistral/lab.cc
diff --git a/cyclonev/main.cc b/mistral/main.cc
index 702b4b7e..702b4b7e 100644
--- a/cyclonev/main.cc
+++ b/mistral/main.cc