Merge branch 'master' of github.com:sifive/freedom-e-sdk into misc-cl…

…eanup1
sifive · Apr 9, 2020 · 08ae218 · 08ae218
2 parents 6e019d3 + 4b760cb
commit 08ae218
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/FreeRTOS-metal b/FreeRTOS-metal
diff --git a/bsp/sifive-hifive-unleashed/settings.mk b/bsp/sifive-hifive-unleashed/settings.mk
@@ -1,8 +1,8 @@
 # Copyright (C) 2020 SiFive Inc
 # SPDX-License-Identifier: Apache-2.0
 
-RISCV_ARCH = rv64imafdc
-RISCV_ABI = lp64d
+RISCV_ARCH = rv64imac
+RISCV_ABI = lp64
 RISCV_CMODEL = medany
 RISCV_SERIES = sifive-5-series
 

diff --git a/bsp/update-targets.sh b/bsp/update-targets.sh
@@ -7,7 +7,7 @@ help() {
 $0: BSP Generator for the SiFive Freedom E SDK
     --help                     Prints this help text.
     --target-name              Specify bsp target name.
-    --target-type              Specify bsp target type [rtl | arty | vc707].
+    --target-type              Specify bsp target type [rtl | arty | vc707 | vcu118].
     --sdk-path=*               The path to the freedom-e-sdk clone directory, public or private.
     --target-dts=*.dts         The path to the target device tree that will be used.
 EOF
@@ -131,7 +131,7 @@ update_target() {
     pushd  $TARGET && $BARE_HEADER_GENERATOR -d $DTB_FILENAME -o $BARE_HEADER_FILENAME || warn "Failed to produce $TARGET/$BARE_HEADER_FILENAME" && popd
     . ${FREEDOM_E_SDK_VENV_PATH}/bin/activate && $CMSIS_SVD_GENERATOR -d $TARGET/$DESIGN_DTS_FILENAME -o $TARGET/$CMSIS_SVD_FILENAME || warn "Failed to produce $TARGET/$CMSIS_SVD_FILENAME"
 
-    if [[ "$TARGET_TYPE" =~ "arty" || "$TARGET_TYPE" =~ "vc707" || "$TARGET_TYPE" =~ "hifive" ]] ; then
+    if [[ "$TARGET_TYPE" =~ "arty" || "$TARGET_TYPE" =~ "vc707" || "$TARGET_TYPE" =~ "vcu118" || "$TARGET_TYPE" =~ "hifive" ]] ; then
         if [ `grep -c "jlink" $TARGET/$SETTINGS_FILENAME` -ne 1 ] ; then
             echo "generating $OPENOCDCFG_FILENAME"
             . ${FREEDOM_E_SDK_VENV_PATH}/bin/activate && $OPENOCDCFG_GENERATOR -d $TARGET/$DESIGN_DTS_FILENAME -b $TARGET_TYPE -o $TARGET/$OPENOCDCFG_FILENAME || warn "Failed to produce $TARGET/$OPENOCDCFG_FILENAME"

diff --git a/scripts/devicetree-overlay-generator b/scripts/devicetree-overlay-generator
diff --git a/scripts/esdk-settings-generator b/scripts/esdk-settings-generator
diff --git a/scripts/openocdcfg-generator b/scripts/openocdcfg-generator
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
@@ -15,7 +15,7 @@
         "source": "[email protected]:sifive/elf2hex.git"
     },
     {
-        "commit": "c294344b115b926d0c7b03073593cc417a6f5db7",
+        "commit": "69650c55fe381b642e493e93a7408038e1b5d434",
         "name": "devicetree-overlay-generator",
         "source": "[email protected]:sifive/devicetree-overlay-generator.git"
     },
@@ -30,12 +30,12 @@
         "source": "[email protected]:sifive/cmsis-svd-generator.git"
     },
     {
-        "commit": "e91034b8b8e7994b2c23f9e7e7cfff36bf031a91",
+        "commit": "b766f5cd74f6ab0980079dfded145144189e4325",
         "name": "openocdcfg-generator",
         "source": "[email protected]:sifive/openocdcfg-generator.git"
     },
     {
-        "commit": "c974863998bf05d96d25bbb153a6f6e80ffd90e2",
+        "commit": "9e82c3473032481e6a6d969b9d168b2bbe109744",
         "name": "esdk-settings-generator",
         "source": "[email protected]:sifive/esdk-settings-generator.git"
     },
@@ -205,7 +205,7 @@
         "source": "[email protected]:sifive/benchmark-mem-latency.git"
     },
     {
-        "commit": "5446e8fcfe89d240c50399640ef37ced78715794",
+        "commit": "4ea863345d4f77a6aabdb06da4443d7d7abc7f88",
         "name": "FreeRTOS-metal",
         "source": "[email protected]:sifive/FreeRTOS-metal.git"
     },
+4 −4		build.wake
+4 −1		generate_overlay.py
+1 −0		targets/__init__.py
+29 −0		targets/vcu118.py
+3 −0		.github/workflows/tests.yml
+9 −0		Makefile
+4 −4		build.wake
+35 −3		generate_settings.py
+3 −0		tests/__init__.py
+17 −0		tests/test-arch.py