From 36e83e8b2d9dbfabec1d3d0f51785ee7cc15a87f Mon Sep 17 00:00:00 2001
From: Matt Madison <matt@madison.systems>
Date: Sat, 1 Jan 2022 05:22:48 -0800
Subject: [PATCH] classes: update flashtools references

Signed-off-by: Matt Madison <matt@madison.systems>
---
 classes/image_types_cboot.bbclass | 4 ++--
 classes/image_types_tegra.bbclass | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/classes/image_types_cboot.bbclass b/classes/image_types_cboot.bbclass
index 63a76abf..a2145bff 100644
--- a/classes/image_types_cboot.bbclass
+++ b/classes/image_types_cboot.bbclass
@@ -7,7 +7,7 @@ oe_cbootimg() {
 oe_cbootimg_common() {
     outfile="$2"
     [ -n "$outfile" ] || outfile="${IMGDEPLOYDIR}/$1.cboot"
-    ${STAGING_BINDIR_NATIVE}/tegra186-flash/mkbootimg \
+    ${STAGING_BINDIR_NATIVE}/tegra194-flash/mkbootimg \
         --kernel ${CBOOTIMG_KERNEL} \
         --ramdisk ${IMGDEPLOYDIR}/$1 \
         --output "$outfile"
@@ -29,5 +29,5 @@ make_cboot_image[vardepsexclude] += "DATETIME"
 CONVERSIONTYPES =+ "cboot"
 IMAGE_TYPES += "cpio.gz.cboot"
 
-CONVERSION_DEPENDS_cboot = "tegra186-flashtools-native virtual/kernel:do_deploy"
+CONVERSION_DEPENDS_cboot = "tegra194-flashtools-native virtual/kernel:do_deploy"
 CONVERSION_CMD:cboot = "make_cboot_image ${type}"
diff --git a/classes/image_types_tegra.bbclass b/classes/image_types_tegra.bbclass
index a25fa47f..ffb6e508 100644
--- a/classes/image_types_tegra.bbclass
+++ b/classes/image_types_tegra.bbclass
@@ -61,7 +61,6 @@ TOSIMGFILENAME:tegra194 = "tos-optee_t194.img"
 
 BUP_PAYLOAD_DIR = "payloads_t${@d.getVar('NVIDIA_CHIP')[2:]}x"
 FLASHTOOLS_DIR = "${SOC_FAMILY}-flash"
-FLASHTOOLS_DIR:tegra194 = "tegra186-flash"
 
 TEGRAFLASH_PACKAGE_FORMAT ??= "tar"
 TEGRAFLASH_PACKAGE_FORMATS = "tar zip"
@@ -206,7 +205,7 @@ create_tegraflash_pkg() {
 
 create_tegraflash_pkg:tegra194() {
     local f
-    PATH="${STAGING_BINDIR_NATIVE}/tegra186-flash:${PATH}"
+    PATH="${STAGING_BINDIR_NATIVE}/tegra194-flash:${PATH}"
     rm -rf "${WORKDIR}/tegraflash"
     mkdir -p "${WORKDIR}/tegraflash"
     oldwd=`pwd`
@@ -249,7 +248,7 @@ create_tegraflash_pkg:tegra194() {
         cp $f .
     done
     if [ "${TEGRA_SIGNING_EXCLUDE_TOOLS}" != "1" ]; then
-        cp -R ${STAGING_BINDIR_NATIVE}/tegra186-flash/* .
+        cp -R ${STAGING_BINDIR_NATIVE}/tegra194-flash/* .
         mv ./rollback_parser.py ./rollback/
         tegraflash_generate_bupgen_script
     fi