Merge pull request #457 from sifive/freertos-metal-venv-fixes

Tell FreeRTOS-metal to re-use Freedom E SDK's virtualenv
sifive · Apr 6, 2020 · 774f8b5 · 774f8b5
2 parents 18678e1 + efbc3db
commit 774f8b5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/FreeRTOS-metal b/FreeRTOS-metal
diff --git a/scripts/standalone.mk b/scripts/standalone.mk
@@ -10,6 +10,8 @@ SRC_DIR ?= $(abspath src)
 export FREERTOS_SOURCE_PATH = $(abspath FreeRTOS-metal)
 # FREERTOS_SOURCE_PATH sets the path to the SEGGER SystemView source directory
 export SYSTEMVIEW_SOURCE_PATH = $(abspath Segger_SystemView-metal)
+# Set FREERTOS_METAL_VENV_PATH to re-use Freedom E SDK's virtualenv
+export FREERTOS_METAL_VENV_PATH = $(FREEDOM_E_SDK_VENV_PATH)
 
 #############################################################
 # BSP loading
@@ -215,7 +217,8 @@ $(PROGRAM_ELF): \
 		CXXFLAGS="$(RISCV_CXXFLAGS)" \
 		XCFLAGS="$(RISCV_XCFLAGS)" \
 		LDFLAGS="$(RISCV_LDFLAGS)" \
-		LDLIBS="$(RISCV_LDLIBS)"
+		LDLIBS="$(RISCV_LDLIBS)" \
+		FREERTOS_METAL_VENV_PATH="$(FREERTOS_METAL_VENV_PATH)"
 	mv $(SRC_DIR)/$(basename $(notdir $@)) $@
 	mv $(SRC_DIR)/$(basename $(notdir $@)).map $(dir $@)
 	touch -c $@

diff --git a/scripts/virtualenv.mk b/scripts/virtualenv.mk
@@ -2,7 +2,7 @@
 # By default, the Python virtualenv is created in the `venv` folder at the root
 # of freedom-e-sdk. If you want your virtualenv to be placed somewhere else,
 # set the FREEDOM_E_SDK_VENV_PATH environment variable.
-FREEDOM_E_SDK_VENV_PATH ?= venv
+FREEDOM_E_SDK_VENV_PATH ?= $(CURDIR)/venv
 
 .PHONY: virtualenv
 virtualenv: $(FREEDOM_E_SDK_VENV_PATH)/.stamp

diff --git a/wit-manifest.json b/wit-manifest.json
@@ -205,7 +205,7 @@
         "source": "git@github.com:sifive/benchmark-mem-latency.git"
     },
     {
-        "commit": "5446e8fcfe89d240c50399640ef37ced78715794",
+        "commit": "4ea863345d4f77a6aabdb06da4443d7d7abc7f88",
         "name": "FreeRTOS-metal",
         "source": "git@github.com:sifive/FreeRTOS-metal.git"
     },