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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 10a4516..409b7af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@
   only:
     - develop
     - master
-    - staging
     - /^(?i:develop)-.*$/
 
 services:
@@ -39,33 +38,6 @@
     - name: "The MAGLEF LVS Test"
       install: sh .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
       script: bash .travisCI/lvs/maglef-lvs-check.sh
-    - name: "The mgmt_soc DV Test: Set 1"
-      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 1
-    - name: "The mgmt_soc DV Test: Set 2"
-      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 2
-    - name: "The mgmt_soc DV Test: Set 3"
-      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 3
-    - name: "The mgmt_soc DV Test: Set 4"
-      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 4
-    - 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 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
-    - name: "The user_proj_example DV Test: Set 2"
-      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh user_proj_example 2
-    - name: "The wb_utests DV Test: Set 1"
-      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh wb_utests 1
-    - name: "The wb_utests DV Test: Set 2"
-      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh wb_utests 2
     - name: "The README.rst Consistency Test"
       script: bash .travisCI/base_checks/git-check.sh
     - name: "The Manifest Test"
@@ -73,7 +45,35 @@
         - bash .travisCI/base_checks/manifest-check.sh mag/
         - bash .travisCI/base_checks/manifest-check.sh maglef/
         - bash .travisCI/base_checks/manifest-check.sh verilog/rtl/
-  allow_failures:
-    - name: "The wb_utests DV Test: Set 2"
+    - name: "The mgmt_soc DV Test: Set 1"
+      if: branch = master OR type=cron
       install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
-      script: bash .travisCI/dv/dv-check-wrapper.sh wb_utests 2
+      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 1
+    - name: "The mgmt_soc DV Test: Set 2"
+      if: branch = master OR type=cron
+      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
+      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 2
+    - name: "The mgmt_soc DV Test: Set 3"
+      if: branch = master OR type=cron
+      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
+      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 3
+    - name: "The mgmt_soc DV Test: Set 4"
+      if: branch = master OR type=cron
+      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
+      script: bash .travisCI/dv/dv-check-wrapper.sh mgmt_soc 4
+    - name: "The mgmt_soc DV Test: Set 5"
+      if: branch = master OR type=cron
+      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 user_proj_example DV Test: Set 1"
+      if: branch = master OR type=cron
+      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
+      script: bash .travisCI/dv/dv-check-wrapper.sh user_proj_example 1
+    - name: "The user_proj_example DV Test: Set 2"
+      if: branch = master OR type=cron
+      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
+      script: bash .travisCI/dv/dv-check-wrapper.sh user_proj_example 2
+    - name: "The wb_utests DV Test"
+      if: branch = master OR type=cron
+      install: bash .travisCI/utils/bash_run_wrapper.sh .travisCI/utils/pdkBuild.sh
+      script: bash .travisCI/dv/dv-check-wrapper.sh wb_utests 1

.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 b661b0a..d4e4d66 100644
--- a/.travisCI/dv/run-dv-wb_utests.sh
+++ b/.travisCI/dv/run-dv-wb_utests.sh
@@ -17,9 +17,7 @@
 PDK_PATH=$1
 TARGET_PATH=$2
 ID=$3
-WB_UTESTS_PATTERNS_1=(intercon_wb spimemio_wb storage_wb uart_wb gpio_wb la_wb mprj_ctrl sysctrl_wb spi_sysctrl_wb)
-WB_UTESTS_PATTERNS_2=(mem_wb)
-
+WB_UTESTS_PATTERNS_1=(intercon_wb spimemio_wb storage_wb uart_wb gpio_wb la_wb mprj_ctrl sysctrl_wb spi_sysctrl_wb mem_wb)
 
 VERDICT_FILE=$TARGET_PATH/wb_utests_verdict.out
 OUT_FILE=$TARGET_PATH/wb_utests_dv.$ID.out
@@ -32,12 +30,6 @@
     tot=$(( 2*(len) ))
     ;;
 
-  2)
-    bash $TARGET_PATH/.travisCI/dv/run-dv-set.sh $PDK_PATH "${WB_UTESTS_PATTERNS_2[@]}" . wb_utests 2 $TARGET_PATH
-    len=${#WB_UTESTS_PATTERNS_2[@]}
-    tot=$(( 2*len ))
-    ;;
-
   *)
     echo -n "unknown ID $ID"
     exit 2

verilog/dv/wb_utests/mem_wb/mem_wb_tb.v

diff --git a/verilog/dv/wb_utests/mem_wb/mem_wb_tb.v b/verilog/dv/wb_utests/mem_wb/mem_wb_tb.v
index 1a9c562..cfc82aa 100644
--- a/verilog/dv/wb_utests/mem_wb/mem_wb_tb.v
+++ b/verilog/dv/wb_utests/mem_wb/mem_wb_tb.v
@@ -59,7 +59,7 @@
 
 	initial begin		// Power-up sequence
 		power1 <= 1'b0;
-		#200;
+		#1;
 		power1 <= 1'b1;
 	end