From bc2dc9837a882a5cde16a8bd2808efeb7f03472a Mon Sep 17 00:00:00 2001
From: Mehrdad Hessar <mhessar@octoml.ai>
Date: Mon, 13 Sep 2021 14:04:25 -0700
Subject: [PATCH 1/3] fix board names

---
 apps/microtvm/reference-vm/README.md                         | 2 +-
 apps/microtvm/reference-vm/base-box-tool.py                  | 2 +-
 apps/microtvm/zephyr/template_project/microtvm_api_server.py | 4 ++--
 tests/micro/zephyr/test_zephyr_aot.py                        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/microtvm/reference-vm/README.md b/apps/microtvm/reference-vm/README.md
index a2302ef24c1f..a5bb63574ce3 100644
--- a/apps/microtvm/reference-vm/README.md
+++ b/apps/microtvm/reference-vm/README.md
@@ -85,7 +85,7 @@ $ ./base-box-tool.py --provider virtualbox build zephyr
 
    For example:
    ```base
-   $ ./base-box-tool.py --provider virtualbox test --microtvm-board=stm32f746xx_disco zephyr
+   $ ./base-box-tool.py --provider virtualbox test --microtvm-board=stm32f746g_disco zephyr
    ```
 
    This command does the following for the specified provider:
diff --git a/apps/microtvm/reference-vm/base-box-tool.py b/apps/microtvm/reference-vm/base-box-tool.py
index 1682f5e1e032..3a5fd18cede7 100755
--- a/apps/microtvm/reference-vm/base-box-tool.py
+++ b/apps/microtvm/reference-vm/base-box-tool.py
@@ -73,7 +73,7 @@
     ),
     "zephyr": (
         "nucleo_f746zg",
-        "stm32f746xx_disco",
+        "stm32f746g_disco",
         "nrf5340dk_nrf5340_cpuapp",
         "mps2_an521",
     ),
diff --git a/apps/microtvm/zephyr/template_project/microtvm_api_server.py b/apps/microtvm/zephyr/template_project/microtvm_api_server.py
index af52d21e50ab..f2e091b2f5b5 100644
--- a/apps/microtvm/zephyr/template_project/microtvm_api_server.py
+++ b/apps/microtvm/zephyr/template_project/microtvm_api_server.py
@@ -80,8 +80,8 @@
         "board": "nrf5340dk_nrf5340_cpuapp",
         "model": "nrf5340dk",
     },
-    "stm32f746xx_disco": {
-        "board": "stm32f746xx_disco",
+    "stm32f746g_disco": {
+        "board": "stm32f746g_disco",
         "model": "stm32f746xx",
     },
     "nucleo_f746zg": {
diff --git a/tests/micro/zephyr/test_zephyr_aot.py b/tests/micro/zephyr/test_zephyr_aot.py
index 1499d1ef27eb..6c72d3d7becf 100644
--- a/tests/micro/zephyr/test_zephyr_aot.py
+++ b/tests/micro/zephyr/test_zephyr_aot.py
@@ -140,8 +140,8 @@ def test_tflite(temp_dir, board, west_cmd, tvm_debug):
         "qemu_x86",
         "mps2_an521",
         "nrf5340dk_nrf5340_cpuapp",
-        "stm32l4r5zi_nucleo",
-        "zynq_mp_r5",
+        "nucleo_l4r5zi",
+        "qemu_cortex_r5",
     ]:
         pytest.skip(msg="Model does not fit.")
 

From c7768f09911a0e79d6c868daad9807fba7e4fb5d Mon Sep 17 00:00:00 2001
From: Mehrdad Hessar <mhessar@octoml.ai>
Date: Mon, 13 Sep 2021 17:10:25 -0700
Subject: [PATCH 2/3] fix base_box test

---
 apps/microtvm/reference-vm/zephyr/base-box/base_box_test.sh | 2 +-
 apps/microtvm/reference-vm/zephyr/base-box/test-config.json | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/microtvm/reference-vm/zephyr/base-box/base_box_test.sh b/apps/microtvm/reference-vm/zephyr/base-box/base_box_test.sh
index 2a023b520b01..a1da0bbe4e35 100755
--- a/apps/microtvm/reference-vm/zephyr/base-box/base_box_test.sh
+++ b/apps/microtvm/reference-vm/zephyr/base-box/base_box_test.sh
@@ -32,7 +32,7 @@ board=$1
 
 pytest tests/micro/zephyr/test_zephyr.py --zephyr-board=${board}
 
-if [ $board == "stm32f746xx" ]; then
+if [ $board == "stm32f746g_disco" ] || [ $board == "nucleo_f746zg" ]; then
     echo "NOTE: skipped test_zephyr_aot.py on $board -- known failure"
 else
     pytest tests/micro/zephyr/test_zephyr_aot.py --zephyr-board=${board}
diff --git a/apps/microtvm/reference-vm/zephyr/base-box/test-config.json b/apps/microtvm/reference-vm/zephyr/base-box/test-config.json
index f3f2633d9468..6e0cfa5e2527 100644
--- a/apps/microtvm/reference-vm/zephyr/base-box/test-config.json
+++ b/apps/microtvm/reference-vm/zephyr/base-box/test-config.json
@@ -1,13 +1,13 @@
 {
-    "stm32f746xx_nucleo": {
+    "nucleo_f746zg": {
         "vid_hex": "0483",
         "pid_hex": "374b"
         },
-    "stm32f746xx_disco": {
+    "stm32f746g_disco": {
         "vid_hex": "0483",
         "pid_hex": "374b"
         },
-    "nrf5340dk": {
+    "nrf5340dk_nrf5340_cpuapp": {
         "vid_hex": "1366",
         "pid_hex": "1055"
         },

From dbeb0307dac4696e22a089c942945571f71e92a9 Mon Sep 17 00:00:00 2001
From: Mehrdad Hessar <mhessar@octoml.ai>
Date: Mon, 13 Sep 2021 17:10:44 -0700
Subject: [PATCH 3/3] fix tutorial

---
 tutorials/micro/micro_reference_vm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/micro/micro_reference_vm.py b/tutorials/micro/micro_reference_vm.py
index 848d13acc391..773329405282 100644
--- a/tutorials/micro/micro_reference_vm.py
+++ b/tutorials/micro/micro_reference_vm.py
@@ -143,7 +143,7 @@
 .. code-block:: bash
 
     $ cd apps/microtvm/reference-vm/zephyr
-    $ poetry run python3 ../../../../tests/micro/qemu/test_zephyr.py --zephyr-board=stm32f746xx
+    $ poetry run python3 ../../../../tests/micro/qemu/test_zephyr.py --zephyr-board=stm32f746g_disco
 
 If you do not have physical hardware attached, but wish to run the tests using the
 local QEMU emulator running within the VM, run the following commands instead: