Merge pull request f4pga#930 from litghost/use_symbiflow_libusb

Use libusb from symbiflow repo (which has no libudev).
mithro · Aug 6, 2019 · 5121fed · 5121fed
2 parents da42aed + dbd6192
commit 5121fed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,31 +28,18 @@ add_custom_target(all_xc7_tests)
 add_custom_target(all_ice40_tests)
 
 setup_env(
-    MINICONDA3_VERSION 4.5.12
+    MINICONDA3_VERSION 4.7.10
     )
 add_conda_package(
   NAME yosys
   PROVIDES yosys
   PACKAGE_SPEC "yosys 0.8_1161_g8d943b4c 20190531_112316"
   )
-add_conda_package(
-  NAME libusb
-  NO_EXE
-  PACKAGE_SPEC "libusb 1.0.20"
-  )
 add_conda_package(
   NAME openocd
   PROVIDES openocd
   )
 
-# Force a specific version of libusb, libusb 1.0.22 is broken.
-get_target_property_required(USE_CONDA env USE_CONDA)
-if(${USE_CONDA})
-    get_target_property_required(LIBUSB_TARGET env LIBUSB_TARGET)
-    get_target_property_required(OPENOCD_TARGET env OPENOCD_TARGET)
-    add_dependencies(${OPENOCD_TARGET} ${LIBUSB_TARGET})
-endif()
-
 add_conda_package(
   NAME vtr
   PROVIDES vpr genfasm

diff --git a/common/cmake/env.cmake b/common/cmake/env.cmake
@@ -86,9 +86,11 @@ function(SETUP_ENV)
       COMMAND ${CONDA_BIN} config --system --set always_yes yes
       COMMAND ${CONDA_BIN} config --system --add envs_dirs ${CONDA_DIR}/envs
       COMMAND ${CONDA_BIN} config --system --add pkgs_dirs ${CONDA_DIR}/pkgs
-      COMMAND ${CONDA_BIN} config --add channels symbiflow
       COMMAND ${CONDA_BIN} config --add channels m-labs
       COMMAND ${CONDA_BIN} config --add channels conda-forge
+      COMMAND ${CONDA_BIN} config --add channels pkgw-forge
+      # Make sure symbiflow is highest priority channel
+      COMMAND ${CONDA_BIN} config --add channels symbiflow
       COMMAND ${CONDA_BIN} install lxml
       COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${CONDA_BIN}
       DEPENDS ${DEPS}

diff --git a/ice40/icestorm.cmake b/ice40/icestorm.cmake
@@ -51,13 +51,12 @@ function(icestorm_setup)
 
   get_target_property_required(PKG-CONFIG env PKG-CONFIG)
   get_target_property(PKG-CONFIG_TARGET env PKG-CONFIG_TARGET)
-  get_target_property(LIBUSB_TARGET env LIBUSB_TARGET)
 
   add_thirdparty_package(
     NAME icestorm
     PROVIDES iceprog icebox_hlc2asc icebox_vlog icepack icetime
     BUILD_INSTALL_COMMAND "make -C ${ICESTORM_SRC} clean && make -C ${ICESTORM_SRC} ${ICESTORM_PREFIX} PKG_CONFIG=${PKG-CONFIG} install"
-    DEPENDS ${LIBFTDI_TARGET} ${PKG-CONFIG} ${PKG-CONFIG_TARGET} ${LIBUSB_TARGET}
+    DEPENDS ${LIBFTDI_TARGET} ${PKG-CONFIG} ${PKG-CONFIG_TARGET}
     )
 
   get_target_property_required(ICEBOX_VLOG env ICEBOX_VLOG)