[meta-zephyr,2/2] zephyr-flash-bossac.bbclass: Use internal bossac tool instead looking up PATH

Message ID 20220124124304.2492266-2-andrei@gherzan.com
State New
Headers show
Series [meta-zephyr,1/2] bossa-native: Add Arduino variant of the bossa flashing tool | expand

Commit Message

Andrei Gherzan Jan. 24, 2022, 12:43 p.m. UTC
From: Stefan Schmidt <stefan.schmidt@huawei.com>

Instead of looking in PATH on the host to find bossac we now depend on the
native variant we build and set the path to our yocto build tool.

Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
 meta-zephyr-core/classes/zephyr-flash-bossac.bbclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


diff --git a/meta-zephyr-core/classes/zephyr-flash-bossac.bbclass b/meta-zephyr-core/classes/zephyr-flash-bossac.bbclass
index 50222d5..51f2dd3 100644
--- a/meta-zephyr-core/classes/zephyr-flash-bossac.bbclass
+++ b/meta-zephyr-core/classes/zephyr-flash-bossac.bbclass
@@ -1,17 +1,17 @@ 
 #@DESCRIPTION: class file to flash boards like Arduino Nano BLE which depends on bossac for flashing
+DEPENDS += "bossa-native"
 python do_flash_usb() {
     import shutil
     import subprocess
     import serial.tools.list_ports
-    # Note: make sure the installed bossac is set to PATH before running flash_usb()
     # Check if bossac is avaiable for flashing
-    origbbenv = d.getVar("BB_ORIGENV", False)
-    bossac_path = shutil.which("bossac", path=origbbenv.getVar('PATH'))
+    bossac_path = shutil.which("bossac")
     if not bossac_path:
-       bb.fatal("ERROR: bossac not found, please install first and add to PATH")
+       bb.fatal("ERROR: bossac not found.")
     board = d.getVar('BOARD')
@@ -47,4 +47,3 @@  python do_flash_usb() {
 addtask do_flash_usb after do_deploy
 do_flash_usb[nostamp] = "1"
-do_flash_usb[vardepsexclude] = "BB_ORIGENV"