Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[microTVM] Remove QEMU installation from RVM #8701

Merged
merged 3 commits into from
Aug 12, 2021
Merged

[microTVM] Remove QEMU installation from RVM #8701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e27370b
Remove qemu installation from Zephyr RVM
mehrdadh Aug 10, 2021
25a8dae
Merge branch 'main' into update_rvm
mehrdadh Aug 10, 2021
b0ca86a
Merge branch 'main' into update_rvm
mehrdadh Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions apps/microtvm/reference-vm/base-box-tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,7 @@ def attach_vmware(uuid, vid_hex=None, pid_hex=None, serial=None):

# Extra scripts required to execute on provisioning
# in zephyr/base-box/base_box_provision.sh
EXTRA_SCRIPTS = (
"docker/install/ubuntu_init_zephyr_project.sh",
"docker/install/ubuntu_install_qemu.sh",
)
EXTRA_SCRIPTS = ("docker/install/ubuntu_init_zephyr_project.sh",)


def generate_packer_config(file_path, providers):
Expand Down
3 changes: 0 additions & 3 deletions apps/microtvm/reference-vm/zephyr/base-box/base_box_provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,5 @@ cd ~
# Using most recent commit that passes all the tests.
~/ubuntu_init_zephyr_project.sh ~/zephyr v2.5-branch --commit dabf23758417fd041fec2a2a821d8f526afac29d

# Build QEMU
sudo ~/ubuntu_install_qemu.sh --target-list arm-softmmu

# Cleanup
rm -f *.sh
1 change: 1 addition & 0 deletions apps/microtvm/reference-vm/zephyr/provision_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ poetry run pip3 install -r ${ZEPHYR_BASE}/scripts/requirements.txt
echo "export TVM_LIBRARY_PATH=\"$TVM_HOME\"/build-microtvm" >>~/.profile
echo "VENV_PATH=\$((cd \"$TVM_HOME\"/apps/microtvm/reference-vm/zephyr && poetry env list --full-path) | sed -E 's/^(.*)[[:space:]]\(Activated\)\$/\1/g')" >>~/.profile
echo "source \$VENV_PATH/bin/activate" >>~/.profile
echo "export PATH=\"\${PATH}:\${HOME}/zephyr-sdk/sysroots/x86_64-pokysdk-linux/usr/bin\"" >>~/.profile
1 change: 0 additions & 1 deletion tutorials/micro/micro_reference_vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@
.. code-block:: bash

$ cd /Users/yourusername/path/to/tvm
$ sudo ./docker/install/ubuntu_install_qemu.sh
$ cd apps/microtvm/reference-vm/zephyr/
$ poetry run pytest ../../../../tests/micro/qemu/test_zephyr.py --microtvm-platforms=host

Expand Down