[GVSOC] Switch to new stand-alone repo

.gitmodules

@@ -1,6 +1,4 @@
-[submodule "tools/gvsoc/pulp"]
- path = tools/gvsoc/pulp
- url = ../gvsoc_pulp.git
-[submodule "tools/gvsoc/common"]
- path = tools/gvsoc/common
- url = https://github.com/GreenWaves-Technologies/gvsoc.git
+
+[submodule "tools/gvsoc"]
+ path = tools/gvsoc
+ url = https://github.com/gvsoc/gvsoc.git

CMakeLists.txt

@@ -14,7 +14,7 @@ if(CCACHE_FOUND)
  set(CMAKE_CXX_COMPILER_LAUNCHER ccache)
 endif()
 
-add_subdirectory(tools/gvsoc/common)
+add_subdirectory(tools/gvsoc/core)
 
 ## Install pip requirements, note: does not install nntool reqs as building
 ## will do that

configs/common.sh

@@ -35,7 +35,7 @@ export PULP_CONFIGS_PATH=$PULP_SDK_HOME/tools/gap-configs/configs:$PULP_CONFIGS_
 export PATH=$PULP_SDK_HOME/tools/gapy_v2/bin:$PATH
 
 # GVSOC
-export GVSOC_MODULES="${GAP_SDK_HOME}/tools/gvsoc/common;${GAP_SDK_HOME}/tools/gvsoc/pulp"
+export GVSOC_MODULES="${GAP_SDK_HOME}/tools/gvsoc/core;${GAP_SDK_HOME}/tools/gvsoc/pulp"
 export GVSOC_TARGETS="$GAPY_V2_TARGET"
 
 

rtos/pulpos/common/rules/pulpos/default_rules.mk

@@ -307,7 +307,7 @@ endif
 
 ifeq '$(use_gvsoc_target)' '1'
 GAPY_TARGET_OPT += $(foreach module,$(subst ;, , $(GVSOC_MODULES)),--target-dir=$(module)/models)
-GAPY_TARGET_OPT += --install-dir=$(INSTALL_DIR)/python
+GAPY_TARGET_OPT += --model-dir=$(INSTALL_DIR)/models
 else
 GAPY_TARGET_OPT += --target-dir=$(PULP_SDK_HOME)/tools/gapy/targets
 endif