meta: update recipes R36.3.0/JetPack 6 -> R36.4.0/JetPack 6.1

Signed-off-by: Ilies CHERGUI <ichergui@nvidia.com>
Signed-off-by: Matt Madison <matt@madison.systems>

classes-recipe/l4t_bsp.bbclass

@@ -4,11 +4,11 @@ L4T_SRCS_NAME ??= "sources"
 L4T_BSP_PREFIX ??= "Jetson"
 
 inherit l4t_version
-L4T_LIB_VERSION ?= "540.3.0"
+L4T_LIB_VERSION ?= "540.4.0"
 
 # Version (date-time stamp) suffixes for nvidia-l4t-* packages
 # in the package feeds.
-L4T_BSP_DEB_DEFAULT_VERSION = "20240506102626"
+L4T_BSP_DEB_DEFAULT_VERSION = "20240912212859"
 L4T_BSP_DEB_VERSION ?= "${L4T_BSP_DEB_DEFAULT_VERSION}"
 L4T_BSP_DEB_ORIG_VERSION = ""
 L4T_BSP_DEB_PACKAGES_USING_ORIG_VERSION = ""

classes/l4t_version.bbclass

@@ -1 +1 @@
-L4T_VERSION ?= "36.3.0"
+L4T_VERSION ?= "36.4.0"

conf/machine/include/tegra234.inc

@@ -53,7 +53,7 @@ TEGRA_BOOT_FIRMWARE_FILES = "\
     pinctrl-tegra.h \
     tegra234-gpio.h \
     readinfo_t234_min_prod.xml \
-    fsi-fw-ecc.bin \
+    fsi-lk.bin \
     nvpva_020.fw \
     tsec_t234.bin \
 "

recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-l4t-r36.4.0.bb

@@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/atf_src.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 SRC_URI += "file://0001-workaround-to-fix-ld.bfd-warning-binutils-version-2..patch"
 

recipes-bsp/tegra-binaries/files/0006-Update-tegra-python-scripts-for-Python3.patch

@@ -1,6 +1,6 @@
-From aad94a92d413527b3e426b8cdefb3349711e4e8c Mon Sep 17 00:00:00 2001
+From 82d30197f786360ce90d8c6410692c0f6449d261 Mon Sep 17 00:00:00 2001
 From: Ilies CHERGUI <ichergui@nvidia.com>
-Date: Thu, 29 Feb 2024 13:03:50 +0000
+Date: Sun, 6 Oct 2024 14:16:52 +0100
 Subject: [PATCH] Update tegra python scripts for Python3
 
 Upstream-Status: Inappropriate [OE specific]
@@ -8,146 +8,12 @@ Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Matt Madison <matt@madison.systems>
 Signed-off-by: Ilies CHERGUI <ichergui@nvidia.com>
 ---
- ...ate-tegra-python-scripts-for-Python3.patch | 126 ++++++++++++++++++
+ bootloader/dtbcheck.py              |  4 ++--
- bootloader/dtbcheck.py                        |   4 +-
+ bootloader/tegraflash_impl_t234.py  |  7 ++++---
- bootloader/tegraflash_impl_t234.py            |   7 +-
+ bootloader/tegraflash_internal.py   | 13 ++++++-------
- bootloader/tegraflash_internal.py             |  13 +-
+ bootloader/tegrasign_v3_internal.py |  7 ++++---
- bootloader/tegrasign_v3_internal.py           |   7 +-
+ 4 files changed, 16 insertions(+), 15 deletions(-)
- 5 files changed, 142 insertions(+), 15 deletions(-)
- create mode 100644 0001-Update-tegra-python-scripts-for-Python3.patch
 
-diff --git a/0001-Update-tegra-python-scripts-for-Python3.patch b/0001-Update-tegra-python-scripts-for-Python3.patch
-new file mode 100644
-index 0000000..609099d
---- /dev/null
-+++ b/0001-Update-tegra-python-scripts-for-Python3.patch
-@@ -0,0 +1,126 @@
-+From 504737120f684c713c2ee95dbc0d189b1830c43b Mon Sep 17 00:00:00 2001
-+From: Ilies CHERGUI <ichergui@nvidia.com>
-+Date: Thu, 29 Feb 2024 13:03:50 +0000
-+Subject: [PATCH] Update tegra python scripts for Python3
-+
-+Signed-off-by: Matt Madison <matt@madison.systems>
-+Signed-off-by: Ilies CHERGUI <ichergui@nvidia.com>
-+---
-+ bootloader/tegraflash_impl_t234.py  |  5 +++--
-+ bootloader/tegraflash_internal.py   | 13 ++++++-------
-+ bootloader/tegrasign_v3_internal.py |  5 +++--
-+ 3 files changed, 12 insertions(+), 11 deletions(-)
-+
-+diff --git a/bootloader/tegraflash_impl_t234.py b/bootloader/tegraflash_impl_t234.py
-+index ed0cb64..59ff0e8 100644
-+--- a/bootloader/tegraflash_impl_t234.py
-++++ b/bootloader/tegraflash_impl_t234.py
-+@@ -1,3 +1,4 @@
-++#!/usr/bin/env python3
-+ #
-+ # Copyright (c) 2014-2023, NVIDIA Corporation.  All Rights Reserved.
-+ #
-+@@ -1383,7 +1384,7 @@ class TFlashT23x_Base(object):
-+ 
-+             bpmp_dtb_in_layout = get_partition_filename('bpmp_fw_dtb', 'type')
-+             if (values['--bins']):
-+-                m = re.search('bpmp_fw_dtb[\s]+([\w._-]+)', values['--bins'])
-++                m = re.search(r'bpmp_fw_dtb[\s]+([\w._-]+)', values['--bins'])
-+                 if m:
-+                     bpmp_dtb = m.group(1)
-+             if bpmp_dtb == None and bpmp_dtb_in_layout == None:
-+@@ -2710,7 +2711,7 @@ class TFlashT23x_Base(object):
-+             command.extend(['--generategpt', '--pt', self.tegraparser_values['--pt']])
-+             run_command(command)
-+ 
-+-            patt = re.compile(".*(mbr|gpt).*\.bin")
-++            patt = re.compile(r".*(mbr|gpt).*\.bin")
-+             contents = os.listdir('.')
-+             for f in contents:
-+                 if patt.match(f):
-+diff --git a/bootloader/tegraflash_internal.py b/bootloader/tegraflash_internal.py
-+index b0ecf7d..211d842 100755
-+--- a/bootloader/tegraflash_internal.py
-++++ b/bootloader/tegraflash_internal.py
-+@@ -1,3 +1,4 @@
-++#!/usr/bin/env python3
-+ #
-+ # SPDX-FileCopyrightText: Copyright (c) 2014-2023, NVIDIA Corporation.  All Rights Reserved.
-+ # SPDX-License-Identifier: LicenseRef-NvidiaProprietary
-+@@ -1195,8 +1196,7 @@ def tegraflash_encrypt_and_sign(exports):
-+         command = exec_file('tegraparser')
-+         command.extend(['--generategpt', '--pt', tegraparser_values['--pt']])
-+         run_command(command)
-+-        import re
-+-        patt = re.compile(".*(mbr|gpt).*\.bin")
-++        patt = re.compile(r".*(mbr|gpt).*\.bin")
-+         contents = os.listdir('.')
-+         for f in contents:
-+             if patt.match(f):
-+@@ -1311,8 +1311,7 @@ def tegraflash_sign(exports):
-+             command = exec_file('tegraparser')
-+             command.extend(['--generategpt', '--pt', tegraparser_values['--pt']])
-+             run_command(command)
-+-            import re
-+-            patt = re.compile(".*(mbr|gpt).*\.bin")
-++            patt = re.compile(r".*(mbr|gpt).*\.bin")
-+             contents = os.listdir('.')
-+             for f in contents:
-+                 if patt.match(f):
-+@@ -3983,7 +3982,7 @@ def tegraflash_bpmp_update_valid_entries(ramcode, lines, dtb_start_pos,
-+     for i in range(0, len(dtb_start_pos)):
-+         for line_num in range(dtb_start_pos[i], dtb_end_pos[i]):
-+             if "phandle" in lines[line_num] and not "linux" in lines[line_num]:
-+-                cur_strap_id = re.search('<(.+?)>', lines[line_num]).group(1)
-++                cur_strap_id = re.search(r'<(.+?)>', lines[line_num]).group(1)
-+                 if cur_strap_id == strap_ids_ph_str[ramcode]:
-+                     valid_entry.append(True)
-+                 else:
-+@@ -4052,7 +4051,7 @@ def tegraflash_bpmp_get_strap_handles(ramcode, test_dts):
-+             #   emc-strap {
-+             #       select = <0xa 0x0 0x0 0x0>;
-+             #   };
-+-            strap_ids_ph_str = re.search('<(.+?)>', line).group(1)
-++            strap_ids_ph_str = re.search(r'<(.+?)>', line).group(1)
-+             strap_ids_ph_str = strap_ids_ph_str.split(' ')
-+             break
-+ 
-+@@ -4518,7 +4517,7 @@ def tegraflash_update_t194_bpmp_dtb(bpmp_uphy_config):
-+ 
-+     bpmp_dtb = get_partition_filename('bpmp_fw_dtb', 'type')
-+     if (values['--bins']):
-+-        m = re.search('bpmp_fw_dtb[\s]+([\w._-]+)', values['--bins'])
-++        m = re.search(r'bpmp_fw_dtb[\s]+([\w._-]+)', values['--bins'])
-+         if m:
-+             bpmp_dtb = m.group(1)
-+     if bpmp_dtb == None:
-+diff --git a/bootloader/tegrasign_v3_internal.py b/bootloader/tegrasign_v3_internal.py
-+index 5cdb06a..e8bcb07 100755
-+--- a/bootloader/tegrasign_v3_internal.py
-++++ b/bootloader/tegrasign_v3_internal.py
-+@@ -1,3 +1,4 @@
-++#!/usr/bin/env python3
-+ #
-+ # Copyright (c) 2018-2023, NVIDIA Corporation.  All Rights Reserved.
-+ #
-+@@ -1033,7 +1034,7 @@ def is_PKC_key(keyfilename, p_key, pkh, mont):
-+         return False
-+ 
-+     # scan the return string for decimal value
-+-    m = re.search('Key size is (\d+)', ret_str)
-++    m = re.search(r'Key size is (\d+)', ret_str)
-+     if m:
-+         p_key.keysize = int(m.group(1))
-+         if (p_key.keysize > 0) and (p_key.keysize < NV_RSA_MAX_KEY_SIZE):
-+@@ -1504,7 +1505,7 @@ def do_kdf_oem_enc(kdf_list, p_key, blockSize):
-+         src = bytearray(f.read())
-+ 
-+     patt = 'kdf_args_' + temp_stem + '.yaml'
-+-    pattd = re.compile('kdf_args_' + temp_stem + '(\d).yaml')
-++    pattd = re.compile('kdf_args_' + temp_stem + r'(\d).yaml')
-+     contents = os.listdir('.')
-+ 
-+     for f in contents:
-+-- 
-+2.34.1
-+
 diff --git a/bootloader/dtbcheck.py b/bootloader/dtbcheck.py
 index fc11369..391e94e 100755
 --- a/bootloader/dtbcheck.py
@@ -166,15 +32,15 @@ index fc11369..391e94e 100755
  
      root = None
 diff --git a/bootloader/tegraflash_impl_t234.py b/bootloader/tegraflash_impl_t234.py
-index 7668f51..edee191 100644
+index fa5b887..6c8c2a4 100644
 --- a/bootloader/tegraflash_impl_t234.py
 +++ b/bootloader/tegraflash_impl_t234.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python3
  #
- # Copyright (c) 2014-2024, NVIDIA Corporation.  All Rights Reserved.
+ # SPDX-FileCopyrightText: Copyright (c) 2014-2024, NVIDIA Corporation.  All Rights Reserved.
- #
+ # SPDX-License-Identifier: LicenseRef-NvidiaProprietary
-@@ -1477,7 +1478,7 @@ class TFlashT23x_Base(object):
+@@ -1530,7 +1531,7 @@ class TFlashT23x_Base(object):
  
              bpmp_dtb_in_layout = get_partition_filename('bpmp_fw_dtb', 'type')
              if (values['--bins']):
@@ -183,7 +49,7 @@ index 7668f51..edee191 100644
                  if m:
                      bpmp_dtb = m.group(1)
              if bpmp_dtb == None and bpmp_dtb_in_layout == None:
-@@ -2939,7 +2940,7 @@ class TFlashT23x_Base(object):
+@@ -3022,7 +3023,7 @@ class TFlashT23x_Base(object):
              command.extend(['--generategpt', '--pt', self.tegraparser_values['--pt']])
              run_command(command)
  
@@ -192,7 +58,7 @@ index 7668f51..edee191 100644
              contents = os.listdir('.')
              for f in contents:
                  if patt.match(f):
-@@ -3001,7 +3002,7 @@ class TFlashT23x_Base(object):
+@@ -3084,7 +3085,7 @@ class TFlashT23x_Base(object):
              binaries.extend([values['--bl']])
  
          if values['--cfg'] is not None :
@@ -202,15 +68,15 @@ index 7668f51..edee191 100644
              if self.tegrabct_values['--bct'] is None and not values['--external_device']:
                  raise tegraflash_exception("Unable to find bct file")
 diff --git a/bootloader/tegraflash_internal.py b/bootloader/tegraflash_internal.py
-index a13f93a..eebcf24 100755
+index 345419c..c4c1ea6 100755
 --- a/bootloader/tegraflash_internal.py
 +++ b/bootloader/tegraflash_internal.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python3
  #
- # Copyright (c) 2014-2023, NVIDIA Corporation.  All Rights Reserved.
+ # SPDX-FileCopyrightText: Copyright (c) 2014-2024, NVIDIA Corporation.  All Rights Reserved.
- #
+ # SPDX-License-Identifier: LicenseRef-NvidiaProprietary
-@@ -1268,8 +1269,7 @@ def tegraflash_encrypt_and_sign(exports):
+@@ -1269,8 +1270,7 @@ def tegraflash_encrypt_and_sign(exports):
          command = exec_file('tegraparser')
          command.extend(['--generategpt', '--pt', tegraparser_values['--pt']])
          run_command(command)
@@ -220,7 +86,7 @@ index a13f93a..eebcf24 100755
          contents = os.listdir('.')
          for f in contents:
              if patt.match(f):
-@@ -1384,8 +1384,7 @@ def tegraflash_sign(exports):
+@@ -1385,8 +1385,7 @@ def tegraflash_sign(exports):
              command = exec_file('tegraparser')
              command.extend(['--generategpt', '--pt', tegraparser_values['--pt']])
              run_command(command)
@@ -230,7 +96,7 @@ index a13f93a..eebcf24 100755
              contents = os.listdir('.')
              for f in contents:
                  if patt.match(f):
-@@ -4054,7 +4053,7 @@ def tegraflash_bpmp_update_valid_entries(ramcode, lines, dtb_start_pos,
+@@ -4055,7 +4054,7 @@ def tegraflash_bpmp_update_valid_entries(ramcode, lines, dtb_start_pos,
      for i in range(0, len(dtb_start_pos)):
          for line_num in range(dtb_start_pos[i], dtb_end_pos[i]):
              if "phandle" in lines[line_num] and not "linux" in lines[line_num]:
@@ -239,7 +105,7 @@ index a13f93a..eebcf24 100755
                  if cur_strap_id == strap_ids_ph_str[ramcode]:
                      valid_entry.append(True)
                  else:
-@@ -4123,7 +4122,7 @@ def tegraflash_bpmp_get_strap_handles(ramcode, test_dts):
+@@ -4124,7 +4123,7 @@ def tegraflash_bpmp_get_strap_handles(ramcode, test_dts):
              #   emc-strap {
              #       select = <0xa 0x0 0x0 0x0>;
              #   };
@@ -248,7 +114,7 @@ index a13f93a..eebcf24 100755
              strap_ids_ph_str = strap_ids_ph_str.split(' ')
              break
  
-@@ -4584,7 +4583,7 @@ def tegraflash_update_t194_bpmp_dtb(bpmp_uphy_config):
+@@ -4586,7 +4585,7 @@ def tegraflash_update_t194_bpmp_dtb(bpmp_uphy_config):
  
      bpmp_dtb = get_partition_filename('bpmp_fw_dtb', 'type')
      if (values['--bins']):
@@ -293,3 +159,6 @@ index bd8671b..53ca1a9 100755
      # Replace '+' with '_' in re_string
      re_string = re_string.replace('+', '_')
      pattd = re.compile(re_string)
+-- 
+2.34.1
+

recipes-bsp/tegra-binaries/files/0009-Remove-xxd-dependency-from-l4t_sign_image.sh.patch

@@ -1,7 +1,7 @@
-From 9853c667dad5330fd5516ac232234141f7e5a678 Mon Sep 17 00:00:00 2001
+From cd9077f2ab8c7c31ad78c8420376b450e6a46c66 Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
+From: Ilies CHERGUI <ichergui@nvidia.com>
-Date: Mon, 26 Apr 2021 07:52:31 -0700
+Date: Sun, 6 Oct 2024 15:18:08 +0100
-Subject: [PATCH] Remove xxd dependency from l4t_sign_image.sh
+Subject: [PATCH 1/2] Remove xxd dependency from l4t_sign_image.sh
 
 since it's not necessarily available in the build environment.
 
@@ -13,10 +13,10 @@ Signed-off-by: Matt Madison <matt@madison.systems>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/l4t_sign_image.sh b/l4t_sign_image.sh
-index 21d7ef8..e75bac1 100755
+index 9a732bc..cff2872 100755
 --- a/l4t_sign_image.sh
 +++ b/l4t_sign_image.sh
-@@ -110,8 +110,7 @@ function write_size_to_sig
+@@ -115,8 +115,7 @@ function write_size_to_sig
  	echo "${SCRIPT_NAME}: chip ${chip}: add $(printf "0x%x" "${size}") to offset "\
  		"$(printf "0x%x" "${offset}") in sig file" >&5
  	# Convert size to bytes in little endian
@@ -26,3 +26,6 @@ index 21d7ef8..e75bac1 100755
  	# write to header at position 0x8
  	dd conv=notrunc if="${tempfile}" of="${sig_file}" bs=1 seek="${offset}" > /dev/null 2>&1;
  	rm "${tempfile}"
+-- 
+2.34.1
+

recipes-bsp/tegra-binaries/files/0010-Rework-logging-in-l4t_sign_image.sh.patch

@@ -1,6 +1,6 @@
-From d0aa71084a824059808d45804211b1fbf2f0d152 Mon Sep 17 00:00:00 2001
+From ae17e4099d84b9facc61bba187fb3ed32c37cccf Mon Sep 17 00:00:00 2001
 From: Ilies CHERGUI <ichergui@nvidia.com>
-Date: Wed, 28 Feb 2024 19:55:34 +0000
+Date: Sun, 6 Oct 2024 15:20:59 +0100
 Subject: [PATCH] Rework logging in l4t_sign_image.sh
 
 to be more compatible with the pseudo environment during
@@ -10,35 +10,52 @@ cloning that the script was using.
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Matt Madison <matt@madison.systems>
+Signed-off-by: Ilies CHERGUI <ichergui@nvidia.com>
 ---
- l4t_sign_image.sh | 22 ++++++++--------------
+ l4t_sign_image.sh | 20 +++++++-------------
- 1 file changed, 8 insertions(+), 14 deletions(-)
+ 1 file changed, 7 insertions(+), 13 deletions(-)
 
 diff --git a/l4t_sign_image.sh b/l4t_sign_image.sh
-index e75bac1..085f50f 100755
+index cff2872..f4cb962 100755
 --- a/l4t_sign_image.sh
 +++ b/l4t_sign_image.sh
-@@ -91,7 +91,7 @@ function write_size_to_sig
+@@ -112,8 +112,8 @@ function write_size_to_sig
- 	local sig_file="${1}"
- 	local size="${2}"
- 	if [ "${chip}" != "0x19" ]; then
--		echo "${SCRIPT_NAME}: chip ${chip}: Don't need to do anything" >&5
-+		[ $quiet -eq 1 ] || echo "${SCRIPT_NAME}: chip ${chip}: Don't need to do anything"
- 		return 0
- 	fi
- 	local offset=${FILE_SIZE_OFFSET_T19x}
-@@ -107,8 +107,8 @@ function write_size_to_sig
  	fi
  	local tempfile
  	tempfile=$(mktemp)
 -	echo "${SCRIPT_NAME}: chip ${chip}: add $(printf "0x%x" "${size}") to offset "\
 -		"$(printf "0x%x" "${offset}") in sig file" >&5
 +	[ $quiet -eq 1 ] || echo "${SCRIPT_NAME}: chip ${chip}: add $(printf "0x%x" "${size}") to offset "\
-+               "$(printf "0x%x" "${offset}") in sig file"
++                "$(printf "0x%x" "${offset}") in sig file"
  	# Convert size to bytes in little endian
  	python3 -c "f = open(\"${tempfile}\",'wb'); f.write(int(${size}).to_bytes(8,'little')); f.close()"
  	# write to header at position 0x8
-@@ -240,13 +240,6 @@ elif [ "${enable_user_kdk}" != "False" ]; then
+@@ -138,8 +138,9 @@ function set_params_using_chipid
+ function sign_file
+ {
+ 	local sig_file="${1}"
+-	echo "${CMD} --chip ${chip} ${options[*]} --cmd sign ${sig_file} ${ftype}" >&5
+-	output="$("${CMD}" --chip "${chip}" "${options[@]}" --cmd "sign \"${sig_file}\" \"${ftype}\"" | tee >(cat - >&5))"
++	[ $quiet -eq 1 ] || "${CMD} --chip ${chip} ${options[*]} --cmd sign ${file} ${ftype}"
++	output="$("${CMD}" --chip "${chip}" "${options[@]}" --cmd "sign \"${file}\" \"${ftype}\"")"
++	[ $quiet -eq 1 ] || echo $output
+ 	if [ -n "${encryptkey}" ]; then
+ 		signedfile="$(echo "${output}" | grep "Signed and encrypted file:" | \
+ 		sed -n "s/.*Signed and encrypted file: //p")"
+@@ -150,10 +151,10 @@ function sign_file
+ 		echo "${SCRIPT_NAME}: Error: Unable to find the signed file generated by tegraflash.py" >&2
+ 		exit 6;
+ 	fi
+-	echo "${SCRIPT_NAME}: Generate header for $(basename "${signedfile}")" >&5
++	[ $quiet -eq 1 ] || echo "${SCRIPT_NAME}: Generate header for $(basename "${signedfile}")"
+ 	dd if="${signedfile}" of="${sig_file}.sig" bs="${offset}" count=1 > /dev/null 2>&1;
+ 	write_size_to_sig "${sig_file}.sig" "${file_size}"
+-	echo "${SCRIPT_NAME}: Generate 16-byte-size-aligned base file for $(basename "${signedfile}")" >&5
++	[ $quiet -eq 1 ] || echo "${SCRIPT_NAME}: Generate 16-byte-size-aligned base file for $(basename "${signedfile}")"
+ 	dd if="${signedfile}" of="${sig_file}" bs="${offset}" skip="1" > /dev/null 2>&1;
+ 	if [[ "${signedfile}" = *_sigheader.encrypt.signed ]]; then
+ 		filename=$(basename -- "$file")
+@@ -310,13 +311,6 @@ elif [ "${enable_user_kdk}" != "False" ]; then
  	exit 1
  fi
  
@@ -52,28 +69,6 @@ index e75bac1..085f50f 100755
  set_params_using_chipid
  
  CMD="${L4T_BOOTLOADER_DIR}/tegraflash.py"
-@@ -261,8 +254,9 @@ if [ "${enable_user_kdk}" == "True" ]; then
+-- 
- 	options+=("--enable_user_kdk")
+2.34.1
- fi
+
- 
--echo "${CMD} --chip ${chip} ${options[*]} --cmd sign ${file} ${ftype}" >&5
--output="$("${CMD}" --chip "${chip}" "${options[@]}" --cmd "sign \"${file}\" \"${ftype}\"" | tee >(cat - >&5))"
-+[ $quiet -eq 1 ] || "${CMD} --chip ${chip} ${options[*]} --cmd sign ${file} ${ftype}"
-+output="$("${CMD}" --chip "${chip}" "${options[@]}" --cmd "sign \"${file}\" \"${ftype}\"")"
-+[ $quiet -eq 1 ] || echo $output
- if [ -n "${encryptkey}" ]; then
- 	signedfile="$(echo "${output}" | grep "Signed and encrypted file:" | \
- 	sed -n "s/.*Signed and encrypted file: //p")"
-@@ -273,10 +267,10 @@ if ! [ -f "${signedfile}" ]; then
- 	echo "${SCRIPT_NAME}: Error: Unable to find the signed file generated by tegraflash.py" >&2
- 	exit 6;
- fi
--echo "${SCRIPT_NAME}: Generate header for $(basename "${signedfile}")" >&5
-+[ $quiet -eq 1 ] || echo "${SCRIPT_NAME}: Generate header for $(basename "${signedfile}")"
- dd if="${signedfile}" of="${file}.sig" bs="${offset}" count=1 > /dev/null 2>&1;
- write_size_to_sig "${file}.sig" "${file_size}"
--echo "${SCRIPT_NAME}: Generate 16-byte-size-aligned base file for $(basename "${signedfile}")" >&5
-+[ $quiet -eq 1 ] || echo "${SCRIPT_NAME}: Generate 16-byte-size-aligned base file for $(basename "${signedfile}")"
- dd if="${signedfile}" of="${file}" bs="${offset}" skip="1" > /dev/null 2>&1;
- if [[ "${signedfile}" = *_sigheader.encrypt.signed ]]; then
- 	filename=$(basename -- "$file")

recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra-binaryonly_36.4.0.bb

@@ -13,7 +13,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-gstreamer"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "18f2fe191e2c921b02ba2d07162642c785da8100b156ccff3417288f4cd620af"
+MAINSUM = "3c792e88ff0b5ae24c20f570574d834d8c3f22a0c51a53e734b2b6b15d6dbf5f"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     libgstnvegl-1.0.so.0 \

recipes-bsp/tegra-binaries/nv-tegra-release_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "3ceb07740975a191fa0b69e02d23f29e1c7cd990cbb3e21da12e8f0cec09b52f"
+MAINSUM = "58cc3d0c2181b96fc88061580c66371009dd463ac20157b14cd3008c963c62d3"
 
 INHIBIT_DEFAULT_DEPS = "1"
 

recipes-bsp/tegra-binaries/nvidia-l4t-optee_36.4.0.bb

@@ -3,7 +3,7 @@ L4T_DEB_COPYRIGHT_MD5 = "76b3130e18f6d6dc3236584f2c985e43"
 require tegra-debian-libraries-common.inc
 
 DESCRIPTION = "Prebuilt OPTEE normal-world binaries"
-MAINSUM = "2032f621e042d75a6dbd2408ee65bc620510c8edb8a8a40d96d2aa5d5779caec"
+MAINSUM = "ed014c60512b5877680c1d5b8dda11e350fa48e25e78bbd58f809698a5baa016"
 
 inherit systemd
 

recipes-bsp/tegra-binaries/tegra-binaries-36.4.0.inc

@@ -6,7 +6,7 @@ SRC_URI = "\
     ${L4T_URI_BASE}/${L4T_BSP_PREFIX}_Linux_R${L4T_VERSION}_aarch64.tbz2 \
 "
 
-SRC_URI[sha256sum] = "b4656540831e74b911e2506d2c567cbb146fddd5942b675f80c2f610d6a40f43"
+SRC_URI[sha256sum] = "7ed97f620e3efc7cedce907612e4c73ae365f8878e8f35fdbf05960199ab001e"
 
 inherit l4t_bsp dos2unix
 

recipes-bsp/tegra-binaries/tegra-brcm-patchram_36.4.0.bb

@@ -8,7 +8,7 @@ require tegra-debian-libraries-common.inc
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://usr/share/doc/nvidia-tegra/LICENSE.brcm_patchram_plus.gz;md5=56c49a020a7573ba8a805f8df531b806"
 
-MAINSUM = "6b52d07535227c8ca1ac48e7ff85b9d674f384ebcf3fe6f1140f2e5702596d42"
+MAINSUM = "aa81e56c2df9cb71d47fbfda0979da541d64d2f86a6e6e57043ec99ad03f3419"
 
 do_install() {
     install -d ${D}${sbindir}

recipes-bsp/tegra-binaries/tegra-configs-alsa_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-init"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "268a9d974765ccf83dec9a0a94e2870c5c789334701bae3a3321c83795c6b431"
+MAINSUM = "9f6af623a7d10bb10ca9c8d28efc8204554cfe1eca5507c5bc9d1f033f138ca8"
 
 SRC_URI += "file://asound.conf.tegra-hda-p3767-p3509"
 

recipes-bsp/tegra-binaries/tegra-configs_36.4.0.bb

@@ -10,9 +10,9 @@ SRC_SOC_DEBS += "\
     ${@l4t_deb_pkgname(d, 'x11')};subdir=${BP};name=x11 \
 "
 
-MAINSUM = "f547d4c3e050c2c275ea0054b3d8693fafdfbc0cf1c01ba2c5ec26cb466d7243"
+MAINSUM = "036ddd41e64b9bfa84aac8a3ad6fc42a17e98524b366b7ea53a269a809a65dad"
-INITSUM = "268a9d974765ccf83dec9a0a94e2870c5c789334701bae3a3321c83795c6b431"
+INITSUM = "9f6af623a7d10bb10ca9c8d28efc8204554cfe1eca5507c5bc9d1f033f138ca8"
-X11SUM = "a3eace1df4921dd804947ded77b28cf73c675894daf144901d7c2ed797c2de20"
+X11SUM = "8ca3e262205412b0b7cc70f159471842870ddeb1450d91c0d8b4150b0039784b"
 SRC_URI[init.sha256sum] = "${INITSUM}"
 SRC_URI[x11.sha256sum] = "${X11SUM}"
 

recipes-bsp/tegra-binaries/tegra-container-passthrough_36.4.0.bb

@@ -12,11 +12,11 @@ SRC_SOC_DEBS += "\
 SRC_COMMON_DEBS += "\
     ${@l4t_deb_pkgname(d, 'gstreamer')};subdir=${BP}/full;name=gstreamer \
 "
-MAINSUM = "27762c5981777dd30abb3da84b1c1c289d3ae7aefc27e11b5ee974bf2f6c834a"
+MAINSUM = "42b37040614faf2799ef3344aa34877b9acefd37c97f8b87e1b74bbca4bc96fe"
-SRC_URI[camera.sha256sum] = "e205f1bc66260ed770f64b072a0a26d3ead3ac82c73b81b796a1a6f542acd369"
+SRC_URI[camera.sha256sum] = "f052d6e8d68a8a52f50109c4274dfaca3422b81e02b66a891c06712c108ef87d"
-SRC_URI[gstreamer.sha256sum] = "18f2fe191e2c921b02ba2d07162642c785da8100b156ccff3417288f4cd620af"
+SRC_URI[gstreamer.sha256sum] = "3c792e88ff0b5ae24c20f570574d834d8c3f22a0c51a53e734b2b6b15d6dbf5f"
-SRC_URI[wayland.sha256sum] = "97e1e7af9715ec9a647c0c1629b2bdf8e631f937b0523900cbbfccdb9f37e9b7"
+SRC_URI[wayland.sha256sum] = "3c177a52e7f79cc32f807e80a59237ab755b44a0093bed331c7e5080593ef8b6"
-SRC_URI[weston.sha256sum] = "e98473a3f8ed17869e4f072b5ca5aaf3a44a9a8b2a531c64237bad045e3a1770"
+SRC_URI[weston.sha256sum] = "53d846be7a5ca0aa050cbddbb1af32804a8786816de3d1eb529e62cf10459b8e"
 
 PASSTHRU_ROOT = "${datadir}/nvidia-container-passthrough"
 

recipes-bsp/tegra-binaries/tegra-firmware_36.4.0.bb

@@ -6,8 +6,8 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-firmware"
 require tegra-debian-libraries-common.inc
 
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'xusb-firmware')};subdir=${BP};name=xusb"
-MAINSUM = "6b52d07535227c8ca1ac48e7ff85b9d674f384ebcf3fe6f1140f2e5702596d42"
+MAINSUM = "aa81e56c2df9cb71d47fbfda0979da541d64d2f86a6e6e57043ec99ad03f3419"
-XUSBSUM = "9a580a0b3a1ba178338741b4b93940f859b54525dab44532166a4a0754d539ba"
+XUSBSUM = "6086a52346c3db49a0ead2dd0bf8856f3fde8e717d30a66a618f9cfa07d8fb65"
 SRC_URI[xusb.sha256sum] = "${XUSBSUM}"
 
 do_install() {

recipes-bsp/tegra-binaries/tegra-helper-scripts/tegra-flash-helper.sh

@@ -419,7 +419,7 @@ if [ "$CHIPID" = "0x23" ]; then
             fi
         fi
         if [ "$BOARDSKU" = "0002" -o "$BOARDSKU" = "0008" ]; then
-            fsifw_binsarg="fsi_fw fsi-fw-ecc.bin;"
+            fsifw_binsarg="fsi_fw fsi-lk.bin;"
         else
             fsifw_binsarg=
         fi
@@ -554,7 +554,7 @@ bpmp_fw $BPF_FILE; \
 bpmp_fw_dtb $BPFDTB_FILE; \
 rce_fw camera-rtcpu-t234-rce.img; \
 ape_fw adsp-fw.bin; \
-spe_fw spe_t234.bin; $fsifw_binsarg \
+spe_fw spe_t234.bin; \
 tsec_fw tsec_t234.bin; \
 tos tos-optee_t234.img; \
 eks eks.img"

recipes-bsp/tegra-binaries/tegra-libraries-camera_36.4.0.bb

@@ -12,9 +12,9 @@ LIC_FILES_CHKSUM += "\
 SRC_COMMON_DEBS += "${@l4t_deb_pkgname(d, 'gstreamer')};subdir=${BP};name=gstreamer"
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'core')};subdir=${BP};name=core"
 
-MAINSUM = "e205f1bc66260ed770f64b072a0a26d3ead3ac82c73b81b796a1a6f542acd369"
+MAINSUM = "f052d6e8d68a8a52f50109c4274dfaca3422b81e02b66a891c06712c108ef87d"
-GSTSUM = "18f2fe191e2c921b02ba2d07162642c785da8100b156ccff3417288f4cd620af"
+GSTSUM = "3c792e88ff0b5ae24c20f570574d834d8c3f22a0c51a53e734b2b6b15d6dbf5f"
-CORESUM = "3ceb07740975a191fa0b69e02d23f29e1c7cd990cbb3e21da12e8f0cec09b52f"
+CORESUM = "58cc3d0c2181b96fc88061580c66371009dd463ac20157b14cd3008c963c62d3"
 SRC_URI[gstreamer.sha256sum] = "${GSTSUM}"
 SRC_URI[core.sha256sum] = "${CORESUM}"
 

recipes-bsp/tegra-binaries/tegra-libraries-core_36.4.0.bb

@@ -5,7 +5,7 @@ require tegra-debian-libraries-common.inc
 LICENSE += "& Apache-2.0"
 LIC_FILES_CHKSUM += "file://usr/share/doc/nvidia-tegra/LICENSE.tegra_sensors;md5=e7fe81c64aaee40b3d9e5b11c3e0ea58"
 
-MAINSUM = "3ceb07740975a191fa0b69e02d23f29e1c7cd990cbb3e21da12e8f0cec09b52f"
+MAINSUM = "58cc3d0c2181b96fc88061580c66371009dd463ac20157b14cd3008c963c62d3"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     nvidia/libnvcolorutil.so \

recipes-bsp/tegra-binaries/tegra-libraries-cuda_36.4.0.bb

@@ -4,8 +4,8 @@ DEPENDS = "tegra-libraries-core"
 require tegra-debian-libraries-common.inc
 
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, '3d-core')};subdir=${BP};name=core3d"
-MAINSUM = "248d18dc1326a4b55894490d9e97c4a2a2541827aaa509d61d0b616824dbea40"
+MAINSUM = "6d3b1c90dda7f313785d5ca919a87278307be6d3596a5cdb4e249b8ea6e8af58"
-CORE3DSUM = "a202ea5f467836eed8466faa7541dec3521c4d1668ca097cea3eee0dfc52cab6"
+CORE3DSUM = "d2606154c4b74d37ce0eb0d81dbcdad6ce420d0874032a05e00f054a05f8cb50"
 SRC_URI[core3d.sha256sum] = "${CORE3DSUM}"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\

recipes-bsp/tegra-binaries/tegra-libraries-dla-compiler_36.4.0.bb

@@ -8,7 +8,7 @@ inherit l4t_deb_pkgfeed
 SRC_COMMON_DEBS = "nvidia-l4t-dla-compiler_${PV}_arm64.deb;subdir=${BPN}"
 PV .= "${@l4t_bsp_debian_version_suffix(d, pkgname='nvidia-l4t-dla-compiler')}"
 
-SRC_URI[sha256sum] = "852ed23e2f6d3b6ea2c7044c18f00a08d3a31ad053a5bd5836b9b08a31351a51"
+SRC_URI[sha256sum] = "31cd17e859590332c17e26ed0b6d3ca4dce604a366b5b724cad89a08fd1b368a"
 
 COMPATIBLE_MACHINE = "(tegra)"
 PACKAGE_ARCH = "${TEGRA_PKGARCH}"

recipes-bsp/tegra-binaries/tegra-libraries-eglcore_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-3d-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "a202ea5f467836eed8466faa7541dec3521c4d1668ca097cea3eee0dfc52cab6"
+MAINSUM = "d2606154c4b74d37ce0eb0d81dbcdad6ce420d0874032a05e00f054a05f8cb50"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra-egl/libEGL_nvidia.so.0 \

recipes-bsp/tegra-binaries/tegra-libraries-gbm-backend_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-gbm"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "41e3a509c54efbae5c6432a1b2dd4d00883180be25a6e88f2f62d14e44d0ee63"
+MAINSUM = "779d1acf0327341ebfe2bf468a47a2026d2e6d168d9cbe6d8ce7d99816868305"
 
 RPROVIDES:${PN} += "tegra-gbm-backend"
 

recipes-bsp/tegra-binaries/tegra-libraries-glescore_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-3d-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "a202ea5f467836eed8466faa7541dec3521c4d1668ca097cea3eee0dfc52cab6"
+MAINSUM = "d2606154c4b74d37ce0eb0d81dbcdad6ce420d0874032a05e00f054a05f8cb50"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra-egl/libGLESv1_CM_nvidia.so.1 \

recipes-bsp/tegra-binaries/tegra-libraries-glxcore_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-3d-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "a202ea5f467836eed8466faa7541dec3521c4d1668ca097cea3eee0dfc52cab6"
+MAINSUM = "d2606154c4b74d37ce0eb0d81dbcdad6ce420d0874032a05e00f054a05f8cb50"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-multimedia-ds_36.4.0.bb

@@ -7,7 +7,7 @@ require tegra-debian-libraries-common.inc
 
 LICENSE += "& MIT & BSD-3-Clause"
 
-MAINSUM = "27762c5981777dd30abb3da84b1c1c289d3ae7aefc27e11b5ee974bf2f6c834a"
+MAINSUM = "42b37040614faf2799ef3344aa34877b9acefd37c97f8b87e1b74bbca4bc96fe"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-multimedia-utils_36.4.0.bb

@@ -3,7 +3,7 @@ DEPENDS = "tegra-libraries-core virtual/egl"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "746da883697216ad54585799a076ab1be984ec4f835972bfecca7708cd508e6c"
+MAINSUM = "daad67f08938d6a13d6c3dd18ea953a60b2cd81d402fbbe517eb9fac8023dd50"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-multimedia-v4l_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-multimedia"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "27762c5981777dd30abb3da84b1c1c289d3ae7aefc27e11b5ee974bf2f6c834a"
+MAINSUM = "42b37040614faf2799ef3344aa34877b9acefd37c97f8b87e1b74bbca4bc96fe"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-multimedia_36.4.0.bb

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM += "\
     file://usr/share/doc/nvidia-tegra/LICENSE.libnvjpeg;md5=1b873f8976e4e3683c04133e3035be98 \
 "
 
-MAINSUM = "27762c5981777dd30abb3da84b1c1c289d3ae7aefc27e11b5ee974bf2f6c834a"
+MAINSUM = "42b37040614faf2799ef3344aa34877b9acefd37c97f8b87e1b74bbca4bc96fe"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-nvdsseimeta_36.4.0.bb

@@ -7,7 +7,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-gstreamer"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "18f2fe191e2c921b02ba2d07162642c785da8100b156ccff3417288f4cd620af"
+MAINSUM = "3c792e88ff0b5ae24c20f570574d834d8c3f22a0c51a53e734b2b6b15d6dbf5f"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     nvidia/libgstnvdsseimeta.so.1.0.0 \

recipes-bsp/tegra-binaries/tegra-libraries-nvml_36.4.0.bb

@@ -3,7 +3,7 @@ DEPENDS = "tegra-libraries-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "11a4cd5c640566f88247bee3baba54c66f7fd2a80539e8b6ae86d877bffa05e7"
+MAINSUM = "930153c7be15bbc835aef2779a50f4114f3cf455924f6f54c5bdd3e93597f9a6"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     nvidia/libnvidia-ml.so.1 \

recipes-bsp/tegra-binaries/tegra-libraries-nvsci_36.4.0.bb

@@ -6,7 +6,7 @@ require tegra-debian-libraries-common.inc
 LICENSE += "& MIT"
 LIC_FILES_CHKSUM += "file://usr/share/doc/nvidia-tegra/LICENSE.libnvscibuf;md5=0cd5a346aecd6451e0224bf024e84756"
 
-MAINSUM = "fd9c87b6c45421211e6cc38e29bb199b8be5be430a74509d37cf269e8c38bf14"
+MAINSUM = "d17a2814e513db6cb45d35d65d80f82a0d05c4d635fd151882176b58f66c57c6"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     nvidia/libnvscibuf.so.1 \

recipes-bsp/tegra-binaries/tegra-libraries-omx_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-multimedia"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "27762c5981777dd30abb3da84b1c1c289d3ae7aefc27e11b5ee974bf2f6c834a"
+MAINSUM = "42b37040614faf2799ef3344aa34877b9acefd37c97f8b87e1b74bbca4bc96fe"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-pva_36.4.0.bb

@@ -3,7 +3,7 @@ DEPENDS = "tegra-libraries-core tegra-libraries-nvsci tegra-libraries-cuda"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "8204637d118eefd5fef1ee81ef7dbb387d96143df6410eff7e058b9fc8fca1af"
+MAINSUM = "3b121f9cc6772624b40b3fc5cff8286afca98e305b351f95d7da8037d52d9a92"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     nvidia/libnvpvaintf.so \

recipes-bsp/tegra-binaries/tegra-libraries-vulkan_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-3d-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "a202ea5f467836eed8466faa7541dec3521c4d1668ca097cea3eee0dfc52cab6"
+MAINSUM = "d2606154c4b74d37ce0eb0d81dbcdad6ce420d0874032a05e00f054a05f8cb50"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-winsys_36.4.0.bb

@@ -4,7 +4,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-3d-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "a202ea5f467836eed8466faa7541dec3521c4d1668ca097cea3eee0dfc52cab6"
+MAINSUM = "d2606154c4b74d37ce0eb0d81dbcdad6ce420d0874032a05e00f054a05f8cb50"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     nvidia/libnvwinsys.so \

recipes-bsp/tegra-binaries/tegra-nvfancontrol_36.4.0.bb

@@ -6,7 +6,7 @@ DEPENDS = "tegra-nvpower"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "ee804eaf59bfc8663dc6dfbf661fb68ce410b367acefa39b81641e757cd1f05b"
+MAINSUM = "0292c80e06f219efee82fa6ead965e7fd0e9545f1ccc3cc2b8e0f2c2b0cfb234"
 
 SRC_URI += "\
    file://nvfancontrol.init \

recipes-bsp/tegra-binaries/tegra-nvphs-base_36.4.0.bb

@@ -8,8 +8,8 @@ require tegra-debian-libraries-common.inc
 
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'init')};subdir=${BP};name=init"
 
-MAINSUM = "3ceb07740975a191fa0b69e02d23f29e1c7cd990cbb3e21da12e8f0cec09b52f"
+MAINSUM = "58cc3d0c2181b96fc88061580c66371009dd463ac20157b14cd3008c963c62d3"
-INITSUM = "268a9d974765ccf83dec9a0a94e2870c5c789334701bae3a3321c83795c6b431"
+INITSUM = "9f6af623a7d10bb10ca9c8d28efc8204554cfe1eca5507c5bc9d1f033f138ca8"
 SRC_URI[init.sha256sum] = "${INITSUM}"
 
 do_install() {

recipes-bsp/tegra-binaries/tegra-nvpmodel-base_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-nvpmodel"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "64b0294a5059059b02bbd366482f5127aab4203482dce59ad3b65cff26dc2f6b"
+MAINSUM = "6063209a7e27e4e852e5b1b819e8b47fca8d1b232c55cbb9c7e06a47a074dcb1"
 
 DEPENDS = "tegra-libraries-core"
 

recipes-bsp/tegra-binaries/tegra-nvpower/0001-Drop-bc-usage-and-remove-symlink-creation-functions.patch

@@ -1,22 +1,21 @@
-From dae2c99a22f25ed54e4eed69ca26066bdf88e8c2 Mon Sep 17 00:00:00 2001
+From 9461d12ae14ec813cd9ee7d8fbbb01a8114d5ec4 Mon Sep 17 00:00:00 2001
 From: Ilies CHERGUI <ichergui@nvidia.com>
-Date: Fri, 3 Nov 2023 23:44:46 +0000
+Date: Sun, 6 Oct 2024 18:59:23 +0100
 Subject: [PATCH] Drop bc usage and remove symlink creation functions
 
+Upstream-Status: Pending
+
 Signed-off-by: Matt Madison <matt@madison.systems>
 Signed-off-by: Ilies CHERGUI <ichergui@nvidia.com>
-
-Upstream-Status: Pending
-Signed-off-by: Matt Madison <matt@madison.systems>
 ---
- etc/systemd/nvpower.sh | 164 ++++-------------------------------------
+ etc/systemd/nvpower.sh | 149 ++---------------------------------------
- 1 file changed, 13 insertions(+), 151 deletions(-)
+ 1 file changed, 7 insertions(+), 142 deletions(-)
 
-Index: tegra-nvpower-36.3.0-20240424200557/etc/systemd/nvpower.sh
+diff --git a/etc/systemd/nvpower.sh b/etc/systemd/nvpower.sh
-===================================================================
+index 97c9de1..3afc042 100755
---- tegra-nvpower-36.3.0-20240424200557.orig/etc/systemd/nvpower.sh
+--- a/etc/systemd/nvpower.sh
-+++ tegra-nvpower-36.3.0-20240424200557/etc/systemd/nvpower.sh
++++ b/etc/systemd/nvpower.sh
-@@ -142,145 +142,6 @@ function set_power_state_perm()
+@@ -140,142 +140,6 @@ function set_power_state_perm()
  	fi
  }
  
@@ -71,6 +70,8 @@ Index: tegra-nvpower-36.3.0-20240424200557/etc/systemd/nvpower.sh
 -			elif [ "${machine}" = "p3767-0000" ] || \
 -				[ "${machine}" = "p3767-0002" ]; then
 -				conf_file="/etc/nvpmodel/nvpmodel_p3767_0000.conf"
+-			elif [ "${machine}" = "p3767-0000-px1" ]; then
+-				conf_file="/etc/nvpmodel/nvpmodel_p3767_0000_px1.conf"
 -			elif [ "${machine}" = "p3767-0000-as-p3767-0001" ] || \
 -				[ "${machine}" = "p3767-0001" ]; then
 -				conf_file="/etc/nvpmodel/nvpmodel_p3767_0001.conf"
@@ -81,10 +82,6 @@ Index: tegra-nvpower-36.3.0-20240424200557/etc/systemd/nvpower.sh
 -			elif [ "${machine}" = "p3767-0004" ] || \
 -				[ "${machine}" = "p3767-0000-as-p3767-0004" ]; then
 -				conf_file="/etc/nvpmodel/nvpmodel_p3767_0004.conf"
--			elif [ "${machine}" = "taylor-high" ]; then
--				conf_file="/etc/nvpmodel/nvpmodel_p3767_0000_taylor_high.conf"
--			elif [ "${machine}" = "taylor-low" ]; then
--				conf_file="/etc/nvpmodel/nvpmodel_p3767_0000_taylor_low.conf"
 -			else
 -				conf_file="/etc/nvpmodel/nvpmodel_p3701_0000.conf"
 -			fi
@@ -125,8 +122,7 @@ Index: tegra-nvpower-36.3.0-20240424200557/etc/systemd/nvpower.sh
 -				if [ "${machine}" = "p3701-0008" ]; then
 -					conf_file="/etc/nvpower/nvfancontrol/nvfancontrol_p3701_0008.conf"
 -				fi
--			elif [[ "${machine}" =~ "p3767" ]] ||
+-			elif [[ "${machine}" =~ "p3767" ]]; then
--				[ "${machine}" = "taylor-high" ] || [ "${machine}" = "taylor-low" ]; then
 -				# All p3767 series share the same fan settings
 -				conf_file="/etc/nvpower/nvfancontrol/nvfancontrol_p3767_0000.conf"
 -			else
@@ -162,46 +158,7 @@ Index: tegra-nvpower-36.3.0-20240424200557/etc/systemd/nvpower.sh
  # CPU hotplug helper function that turns on/off the CPU cores in the specified range
  # * Parameters:
  # * ${1}: desired online status (0 for offline, 1 for online)
-@@ -341,13 +202,8 @@ function set_cpufreq_governor()
+@@ -600,10 +464,12 @@ function setup_actmon()
- 	desired_cpufreq_gov="performance"
- 
- 	if [ ${IS_SAFETY_PLATFORM} -eq 0 ]; then
--		# Enable SCHEDUTIL governor for all SoC's except T194 in Kstable.
--		if [ "${SOCFAMILY}" = "tegra194" ] &&
--			[ "$(echo "${KERNEL_VERSION} >= 6.0" | bc)" -eq 1 ]; then
--			:
--		else
--			desired_cpufreq_gov="schedutil"
--		fi
-+		# Enable SCHEDUTIL governor for all SoC's
-+		desired_cpufreq_gov="schedutil"
- 	fi
- 
- 	if [ -e "${CPUFREQ_AVAIL_GOVS}" ]; then
-@@ -448,7 +304,7 @@ function set_devfreq_governor()
- 	if [ ${IS_SAFETY_PLATFORM} -ne 0 ]; then
- 		desired_devfreq_gov="performance"
- 	else
--		if [ "$(echo "${KERNEL_VERSION} == 5.15" | bc)" -eq 1 ]; then
-+		if [ "${KERNEL_VERSION}" = "5.15" ]; then
- 			desired_devfreq_gov="tegra_wmark"
- 		fi
- 	fi
-@@ -487,10 +343,10 @@ function lock_emc_frequency()
- 
- 	# Set EMC_FREQ to max for Kernel version >= 5.15
- 	# and when the Interconnect support is missing
--	if [ "$(echo "${KERNEL_VERSION} >= 5.15" | bc)" -eq 1 ]; then
-+	if [ "${KERNEL_VERSION}" = "5.15" ]; then
- 		if [ -e "${EMC_MAX_RATE}" ] && [ -e "${EMC_RATE}" ]; then
--			AVG_BW=$(grep "Memory Controller" ${ICC_NODE} | head -1 | awk -F ' ' '{print $3}')
--			PEAK_BW=$(grep "Memory Controller" ${ICC_NODE}| head -1 | awk -F ' ' '{print $4}')
-+			AVG_BW=$(grep "Memory Controller" ${ICC_NODE} | head -n 1 | awk -F ' ' '{print $3}')
-+			PEAK_BW=$(grep "Memory Controller" ${ICC_NODE}| head -n 1 | awk -F ' ' '{print $4}')
- 
- 			if [[ -z "${AVG_BW}" && -z "${PEAK_BW}" ]] ||
- 			   [[ "${AVG_BW}" = "0" && "${PEAK_BW}" = "0" ]]; then
-@@ -701,10 +557,12 @@ function setup_actmon()
  	debugfs_actmon="/sys/kernel/debug/tegra-host1x/actmon"
  
  	# Actmon settings should be the same across engines
@@ -218,7 +175,7 @@ Index: tegra-nvpower-36.3.0-20240424200557/etc/systemd/nvpower.sh
  }
  
  SOCFAMILY=""
-@@ -713,8 +571,6 @@ KERNEL_VERSION=$(uname -r | cut -d '.' -
+@@ -611,8 +477,6 @@ SOCFAMILY=""
  set_socfamily
  set_safety_flag
  set_power_state_perm
@@ -227,8 +184,11 @@ Index: tegra-nvpower-36.3.0-20240424200557/etc/systemd/nvpower.sh
  cpu_hotplug
  set_cpufreq_governor
  set_cpu_floor_freq
-@@ -725,3 +581,4 @@ validate_nvpmodel_conf
+@@ -621,3 +485,4 @@ lock_se_frequency
+ validate_nvpmodel_conf
  setup_hwmon
- setup_tmp451
  setup_actmon
 +exit 0
+-- 
+2.34.1
+

recipes-bsp/tegra-binaries/tegra-nvpower_36.4.0.bb

@@ -8,9 +8,9 @@ require tegra-debian-libraries-common.inc
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'init')};subdir=${BP};name=init"
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'tools')};subdir=${BP};name=tools"
 
-MAINSUM = "3ceb07740975a191fa0b69e02d23f29e1c7cd990cbb3e21da12e8f0cec09b52f"
+MAINSUM = "58cc3d0c2181b96fc88061580c66371009dd463ac20157b14cd3008c963c62d3"
-SRC_URI[init.sha256sum] = "268a9d974765ccf83dec9a0a94e2870c5c789334701bae3a3321c83795c6b431"
+SRC_URI[init.sha256sum] = "9f6af623a7d10bb10ca9c8d28efc8204554cfe1eca5507c5bc9d1f033f138ca8"
-SRC_URI[tools.sha256sum] = "a0e084b43e3e2a9245f195402fa1a8d8275558537edd25e7bd6365c3dc6cfd29"
+SRC_URI[tools.sha256sum] = "987b70e0a4927ec4f9a1b768b117f18d7566676eaec83c6a10452af5110c3084"
 
 SRC_URI += "\
     file://0001-Drop-bc-usage-and-remove-symlink-creation-functions.patch \

recipes-bsp/tegra-binaries/tegra-nvs-base_36.4.0.bb

@@ -6,7 +6,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-init"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "268a9d974765ccf83dec9a0a94e2870c5c789334701bae3a3321c83795c6b431"
+MAINSUM = "9f6af623a7d10bb10ca9c8d28efc8204554cfe1eca5507c5bc9d1f033f138ca8"
 
 do_install() {
     install -d ${D}${sbindir}

recipes-bsp/tegra-binaries/tegra-nvsciipc-base_36.4.0.bb

@@ -10,8 +10,8 @@ SRC_SOC_DEBS += "\
     ${@l4t_deb_pkgname(d, 'init')};subdir=${BP};name=init \
 "
 
-MAINSUM = "a0e084b43e3e2a9245f195402fa1a8d8275558537edd25e7bd6365c3dc6cfd29"
+MAINSUM = "987b70e0a4927ec4f9a1b768b117f18d7566676eaec83c6a10452af5110c3084"
-INITSUM = "268a9d974765ccf83dec9a0a94e2870c5c789334701bae3a3321c83795c6b431"
+INITSUM = "9f6af623a7d10bb10ca9c8d28efc8204554cfe1eca5507c5bc9d1f033f138ca8"
 SRC_URI[init.sha256sum] = "${INITSUM}"
 
 do_install() {

recipes-bsp/tegra-binaries/tegra-redundant-boot-base_36.4.0.bb

@@ -7,7 +7,7 @@ require tegra-debian-libraries-common.inc
 
 DEPENDS = "tegra-libraries-core"
 
-MAINSUM = "a0e084b43e3e2a9245f195402fa1a8d8275558537edd25e7bd6365c3dc6cfd29"
+MAINSUM = "987b70e0a4927ec4f9a1b768b117f18d7566676eaec83c6a10452af5110c3084"
 
 do_install() {
 	install -d ${D}${sbindir}

recipes-bsp/tegra-binaries/tegra-storage-layout_36.4.0.bb

@@ -24,7 +24,7 @@ copy_in_flash_layout() {
                 -e"s,CAMERAFW,camera-rtcpu-t234-rce.img," \
                 -e"s,SPEFILE,spe_t234.bin," \
                 -e"s,BADPAGETYPE,black_list_info," -e"s,BADPAGEFILE,badpage.bin," -e"s,BADPAGENAME,bad-page," \
-                -e"s,FSIFW,fsi-fw-ecc.bin," \
+                -e"s,FSIFW,fsi-lk.bin," \
                 -e"s,PSCBL1FILE,psc_bl1_t234_prod.bin," \
                 -e"s,TSECFW,tsec_t234.bin," \
                 -e"s,NVHOSTNVDEC,nvdec_t234_prod.fw," \

recipes-bsp/tegra-binaries/tegra-tools_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-tools"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "a0e084b43e3e2a9245f195402fa1a8d8275558537edd25e7bd6365c3dc6cfd29"
+MAINSUM = "987b70e0a4927ec4f9a1b768b117f18d7566676eaec83c6a10452af5110c3084"
 
 do_install() {
     install -d ${D}${bindir}

recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia_36.4.0.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-3d-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "a202ea5f467836eed8466faa7541dec3521c4d1668ca097cea3eee0dfc52cab6"
+MAINSUM = "d2606154c4b74d37ce0eb0d81dbcdad6ce420d0874032a05e00f054a05f8cb50"
 
 do_install() {
     install -d ${D}${libdir}/xorg/modules/drivers

recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc

@@ -1,6 +1,6 @@
 L4T_BSP_NAME = "${L4T_SRCS_NAME}"
 SRC_URI = "${L4T_URI_BASE}/public_sources.tbz2;downloadfilename=${L4T_BSP_PREFIX}-public_sources-${L4T_VERSION}.tbz2"
-SRC_URI[sha256sum] = "e94dbe0025ae313eeb603061697afed77b9641d2a06df022888574562dd1f6c5"
+SRC_URI[sha256sum] = "a99cb9176a96cff19ddeb928c9e4a2c5d5bf45787b2c2941fd3e942ee7540292"
 
 inherit l4t_bsp
 

recipes-bsp/uefi/edk2-basetools-tegra-native_36.4.0.bb

@@ -6,7 +6,7 @@
 SUMMARY = "EDK2 Base Tools"
 LICENSE = "BSD-2-Clause-Patent"
 
-require edk2-firmware-core-tegra-36.3.0.inc
+require edk2-firmware-core-tegra-36.4.0.inc
 
 inherit_defer native
 

recipes-bsp/uefi/edk2-firmware-tegra-36.4.0.inc

@@ -1,5 +1,5 @@
 require edk2-firmware.inc
-require edk2-firmware-core-tegra-36.3.0.inc
+require edk2-firmware-core-tegra-36.4.0.inc
 require conf/image-uefi.conf
 
 LICENSE .= " & Proprietary"

recipes-bsp/uefi/edk2-firmware-tegra_36.4.0.bb

@@ -1,4 +1,4 @@
-require edk2-firmware-tegra-36.3.0.inc
+require edk2-firmware-tegra-36.4.0.inc
 
 DESCRIPTION = "UEFI EDK2 Firmware for Jetson platforms"
 

recipes-bsp/uefi/standalone-mm-optee-tegra_36.4.0.bb

@@ -1,4 +1,4 @@
-require edk2-firmware-tegra-36.3.0.inc
+require edk2-firmware-tegra-36.4.0.inc
 
 DESCRIPTION = "Standalone Memory Manager for OP-TEE on Jetson platforms"
 

recipes-graphics/drm/tegra-drm-headers_36.4.0.bb

@@ -10,7 +10,7 @@ PV .= "${@l4t_bsp_debian_version_suffix(d, pkgname='nvidia-l4t-weston')}"
 
 inherit l4t_deb_pkgfeed
 
-SRC_URI[sha256sum] = "e98473a3f8ed17869e4f072b5ca5aaf3a44a9a8b2a531c64237bad045e3a1770"
+SRC_URI[sha256sum] = "53d846be7a5ca0aa050cbddbb1af32804a8786816de3d1eb529e62cf10459b8e"
 
 S = "${WORKDIR}/${BPN}"
 B = "${S}"

recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc

@@ -8,7 +8,7 @@ PV .= "${@l4t_bsp_debian_version_suffix(d, pkgname='nvidia-l4t-graphics-demos')}
 
 inherit l4t_deb_pkgfeed
 
-SRC_URI[sha256sum] = "1964f9db4b279f25a183794c75fd4f88dda757190b8e4548521cc87de47f0438"
+SRC_URI[sha256sum] = "0d54e97336de3fcd3cfac9e928f9f8e93840c226a6e9efb5abdbc3558478e468"
 
 S = "${WORKDIR}/l4t-graphics-demos/usr/src/nvidia/graphics_demos"
 B = "${S}"

recipes-kernel/nvidia-kernel-oot/nvidia-kernel-oot_36.4.0.bb

@@ -14,7 +14,7 @@ TEGRA_SRC_SUBARCHIVE = "\
     Linux_for_Tegra/source/nvidia_kernel_display_driver_source.tbz2 \
 "
 TEGRA_SRC_SUBARCHIVE_OPTS = "-C ${UNPACKDIR}/${BPN}"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 do_unpack[depends] += "tegra-binaries:do_preconfigure"
 do_unpack[dirs] += "${UNPACKDIR}/${BPN}"

recipes-multimedia/argus/tegra-mmapi-36.4.0.inc

@@ -4,7 +4,7 @@ LICENSE = "Proprietary & BSD-3-Clause"
 SRC_COMMON_DEBS = "${@l4t_deb_pkgname(d, 'jetson-multimedia-api')};subdir=tegra-mmapi"
 PV .= "${@l4t_bsp_debian_version_suffix(d, pkgname='nvidia-l4t-jetson-multimedia-api')}"
 
-SRC_URI[sha256sum] = "f145bf4be3dbc918b367ebbf1e148fa478e19d58cc156da79465521832329cdf"
+SRC_URI[sha256sum] = "5e07d1d11f7514f507837f3bf04e84f65233f68d999e20c1f88814ababf66586"
 
 inherit l4t_deb_pkgfeed features_check
 

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvarguscamerasrc_1.0.0-r36.4.0.bb

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://nvbufsurface.h;endline=9;md5=15dccc547ee18664b1b6d1ec
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/gst-nvarguscamera_src.tbz2"
 TEGRA_SRC_SUBARCHIVE_OPTS = "--exclude=3rdpartyheaders.tbz2"
 
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 SRC_URI += "\
     file://0001-Build-fixups.patch \

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvcompositor_1.20.5-r36.4.0.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://gstnvcompositor.h;beginline=64;endline=64;md5=7d1c171
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/gst-nvcompositor_src.tbz2"
 TEGRA_SRC_SUBARCHIVE_OPTS = "--exclude=3rdpartyheaders.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base virtual/egl tegra-mmapi tegra-libraries-multimedia-utils"
 

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvdrmvideosink_1.14.0-r36.4.0.bb

@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.libgstnvdrmvideosink;md5=674ef4559ff709167b72104cb9814e93"
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/libgstnvdrmvideosink_src.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 SRC_URI += " \
     file://0001-Update-makefile-for-OE-builds.patch \

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nveglgles_1.2.3-r36.4.0.bb

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://gst-libs/gst/egl/LICENSE.libgstnvegl-1.0;md5=de0f9dfa
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/gstegl_src.tbz2"
 
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 SRC_URI += "\
     file://0001-Makefile-fixes-for-OE-builds.patch;patchdir=.. \

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvjpeg_1.14.0-r36.4.0.bb

@@ -4,7 +4,7 @@ LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://gst-jpeg/gst-jpeg-1.0/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/gstjpeg_src.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 SRC_URI += "file://use-nvjpeg-for-plugin-name.patch"
 

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvtee_1.14.0-r36.4.0.bb

@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://README.txt;endline=26;md5=d4da79f8cebc6b73ce481b090afa99ae"
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/gst-nvtee_src.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 DEPENDS = "gstreamer1.0 glib-2.0 gstreamer1.0-plugins-base"
 

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvv4l2camerasrc_1.14.0-r36.4.0.bb

@@ -10,7 +10,7 @@ TEGRA_SRC_SUBARCHIVE_OPTS = "--exclude=3rdpartyheaders.tbz2"
 TEGRA_SRC_EXTRA_SUBARCHIVE = "Linux_for_Tegra/source/gst-nvarguscamera_src.tbz2"
 TEGRA_SRC_EXTRA_SUBARCHIVE_OPTS = "-C ${UNPACKDIR}/gst-nvv4l2camera --strip-components=1 gst-nvarguscamera/nvbufsurface.h"
 
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 SRC_URI += "\
     file://0001-Build-fixups.patch \

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvidconv_1.20.5-r36.4.0.bb

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://nvbufsurface.h;endline=9;md5=15dccc547ee18664b1b6d1ec
 "
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/gst-nvvidconv_src.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 DEPENDS = "gstreamer1.0 glib-2.0 gstreamer1.0-plugins-base tegra-libraries-multimedia tegra-mmapi cuda-driver cuda-cudart"
 

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r36.4.0.bb

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.gst-nvvideo4linux2;md5=457fb5d7ae2d8cd8cabcc2
 "
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/gst-nvvideo4linux2_src.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 SRC_URI += "\
     file://0001-v4l2videoenc-Fix-negotiation-caps-leak.patch \

recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideosinks_1.14.0-r36.4.0.bb

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.libgstnvvideosinks;md5=86ed1f32df3aaa376956e4
 "
 
 TEGRA_SRC_SUBARCHIVE = "Linux_for_Tegra/source/libgstnvvideosinks_src.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-36.3.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 
 SRC_URI += "file://0001-build-fixups.patch"
 SRC_URI += "file://0002-nv3dsink-memory-leak-fix.patch"