commit d7280e1cea34606c84a9304bd4cade87c1578f26
author manarabdelaty <manarabdelatty@aucegypt.edu> Tue Jan 05 19:59:23 2021 +0200
committer manarabdelaty <manarabdelatty@aucegypt.edu> Tue Jan 05 19:59:23 2021 +0200
tree 6aa632621258b27bfd3479d3259e518214962eda
parent a9da13d131b485b610df975df88c0e7669cdac29
parent f08040b70c518a3da49139e796453c80db095da5

Merge branch 'develop' of https://github.com/efabless/caravel into develop

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 9fb503d..10a4516 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,9 +54,6 @@
     - name: "The mgmt_soc DV Test: Set 5"
       install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
       script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 5
-    - name: "The mgmt_soc DV Test: Set 6"
-      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 6
     - name: "The user_proj_example DV Test: Set 1"
       install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
       script: bash .travisCI/dv/dv-check-wrapper.sh user_proj_example 1

.travisCI/dv/run-dv-mgmt_soc.sh

diff --git a/.travisCI/dv/run-dv-mgmt_soc.sh b/.travisCI/dv/run-dv-mgmt_soc.sh
index a2d7e21..cd728a7 100644
--- a/.travisCI/dv/run-dv-mgmt_soc.sh
+++ b/.travisCI/dv/run-dv-mgmt_soc.sh
@@ -21,8 +21,7 @@
 MGMT_SOC_PATTERNS_2=(mprj_ctrl pass_thru storage)
 MGMT_SOC_PATTERNS_3=(uart)
 MGMT_SOC_PATTERNS_4=(timer timer2)
-MGMT_SOC_PATTERNS_5=(mem)
-MGMT_SOC_PATTERNS_6=(pll)
+MGMT_SOC_PATTERNS_5=(mem pll)
 
 VERDICT_FILE=$TARGET_PATH/mgmt_soc_verdict.out
 OUT_FILE=$TARGET_PATH/mgmt_soc_dv.$ID.out
@@ -56,13 +55,7 @@
   5)
     bash $TARGET_PATH/.travisCI/dv/run-dv-set.sh $PDK_PATH "${MGMT_SOC_PATTERNS_5[@]}" caravel mgmt_soc 5 $TARGET_PATH
     len=${#MGMT_SOC_PATTERNS_5[@]}
-    export TOTAL=6
-    ;;
-
-  6)
-    bash $TARGET_PATH/.travisCI/dv/run-dv-set.sh $PDK_PATH "${MGMT_SOC_PATTERNS_6[@]}" caravel mgmt_soc 6 $TARGET_PATH
-    len=${#MGMT_SOC_PATTERNS_6[@]}
-    export TOTAL=$(( 2*len ))
+    export TOTAL=8
     ;;
 
   *)

.travisCI/dv/run-dv-wb_utests.sh

diff --git a/.travisCI/dv/run-dv-wb_utests.sh b/.travisCI/dv/run-dv-wb_utests.sh
index 942be21..fdfeddf 100644
--- a/.travisCI/dv/run-dv-wb_utests.sh
+++ b/.travisCI/dv/run-dv-wb_utests.sh
@@ -17,8 +17,8 @@
 PDK_PATH=$1
 TARGET_PATH=$2
 ID=$3
-WB_UTESTS_PATTERNS_1=(intercon_wb spimemio_wb storage_wb uart_wb)
-WB_UTESTS_PATTERNS_2=(gpio_wb la_wb mem_wb mprj_ctrl sysctrl_wb spi_sysctrl_wb)
+WB_UTESTS_PATTERNS_1=(intercon_wb spimemio_wb storage_wb uart_wb gpio_wb la_wb mprj_ctrl sysctrl_wb)
+WB_UTESTS_PATTERNS_2=(mem_wb spi_sysctrl_wb)
 
 
 VERDICT_FILE=$TARGET_PATH/wb_utests_verdict.out