recipes-bsp: update recipes to R35.2.1

Signed-off-by: Matt Madison <matt@madison.systems>

recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-l4t-r35.2.1.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/public/atf_src.tbz2"
-require recipes-bsp/tegra-sources/tegra-sources-35.1.0.inc
+require recipes-bsp/tegra-sources/tegra-sources-35.2.1.inc
 
 SRC_URI += "file://0001-workaround-to-fix-ld.bfd-warning-binutils-version-2..patch"
 

recipes-bsp/tegra-binaries/files/0003-Convert-BUP_generator.py-to-Python3.patch

@@ -1,14 +1,15 @@
-From 35ff09d78c84a8a94eaeb1d791ee6f67067afe0c Mon Sep 17 00:00:00 2001
+From 98915ba48a31a528ea24636604981c3d521cc75b Mon Sep 17 00:00:00 2001
 From: Matt Madison <matt@madison.systems>
-Date: Wed, 22 Jan 2020 05:53:04 -0800
+Date: Tue, 3 Jan 2023 10:20:22 -0800
 Subject: [PATCH] Convert BUP_generator.py to Python3
 
-%% original patch: 0003-Convert-BUP_generator.py-to-Python3.patch
+Ran it through 2to3 for the conversion, then
+made some additional fixes not caught by the tool.
 
-%% original patch: 0003-Convert-BUP_generator.py-to-Python3.patch
+Signed-off-by: Matt Madison <matt@madison.systems>
 ---
- bootloader/BUP_generator.py | 192 ++++++++++++++----------------------
- 1 file changed, 76 insertions(+), 116 deletions(-)
+ bootloader/BUP_generator.py | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
 
 Index: Linux_for_Tegra/bootloader/BUP_generator.py
 ===================================================================
@@ -20,133 +21,16 @@ Index: Linux_for_Tegra/bootloader/BUP_generator.py
  #
  # Copyright (c) 2017-2022, NVIDIA CORPORATION.  All rights reserved.
  #
-@@ -54,11 +54,6 @@ Appendix:
+@@ -52,7 +52,7 @@ Appendix:
+                   (extract all partition bins for "ota.blob" to "OUT/*.raw.bin" without displaying blob info)
+ """
+ 
+-from __future__ import print_function
++
  
  import copy
  import sys
--
--if sys.hexversion < 0x02070000:
--  print >> sys.stderr, "Python 2.7 or newer is required."
--  sys.exit(1)
--
- import os
- import sys
- import struct
-@@ -154,8 +149,8 @@ def generate_BUP(arg):
-     global top_var
- 
-     # Check "TOP" variable is set and is valid
--    if not os.environ.has_key("TOP") or not os.path.isdir(os.environ["TOP"]):
--        if not os.environ.has_key("ANDROID_BUILD_TOP") or \
-+    if "TOP" not in os.environ or not os.path.isdir(os.environ["TOP"]):
-+        if "ANDROID_BUILD_TOP" not in os.environ or \
-                 not os.path.isdir(os.environ["ANDROID_BUILD_TOP"]):
-             sys.stderr.write("Environment variable TOP not set or invalid.\n")
-             return
-@@ -163,11 +158,11 @@ def generate_BUP(arg):
-             top_var = "ANDROID_BUILD_TOP"
- 
-     # Check "OUT" variable is set and is valid
--    if not os.environ.has_key("OUT") or not os.path.isdir(os.environ["OUT"]):
-+    if "OUT" not in os.environ or not os.path.isdir(os.environ["OUT"]):
-         sys.stderr.write("Environment variable OUT not set or invalid.\n")
-         return
- 
--    print 'PARTITION INFO   :', arg.entry_list
-+    print('PARTITION INFO   :', arg.entry_list)
- 
-     if arg.blob_type == 'update':
-         payload_obj = update_payload(arg)
-@@ -190,8 +185,8 @@ def inspect_BUP(arg):
-         sys.stderr.write("Error. Last argument must be a path to a valid blob file. Exiting...\r\n")
-         sys.exit(1)
- 
--    print 'BLOB PATH:'
--    print os.path.realpath(arg.inspect_blob.name)
-+    print('BLOB PATH:')
-+    print(os.path.realpath(arg.inspect_blob.name))
- 
-     if arg.blob_type == 'update':
-         payload_obj = inspect_update_payload(arg)
-@@ -203,18 +198,18 @@ def inspect_BUP(arg):
-         sys.exit(1)
- 
-     if arg.inspect_mode is True and arg.check_entries is True:
--        print
-+        print()
-         payload_obj.check_entry_table()
-     elif arg.inspect_mode is True:
--        print
-+        print()
-         payload_obj.print_blob_header()
--        print
-+        print()
-         payload_obj.print_entry_table()
- 
--    print
-+    print()
-     if arg.inspect_extract_bin_list is not None:
-         # Check "OUT" variable is set and is valid if binary extraction is specified
--        if not os.environ.has_key("OUT") or not os.path.isdir(os.environ["OUT"]):
-+        if "OUT" not in os.environ or not os.path.isdir(os.environ["OUT"]):
-             sys.stderr.write("Environment variable OUT not set or invalid.\r\n" \
-                              "Error. Cannot save binaries. Exiting...\r\n"
-                             )
-@@ -237,7 +232,7 @@ class payload():
-         return version
- 
-     def __init__(self, args):
--        self.magic = bup_magic
-+        self.magic = bup_magic.encode('UTF-8')
-         self.version = self.gen_version()
-         self.blob_size_pos = struct.calcsize('=16sI')
-         self.header_packing = '=16sIIIIII'
-@@ -320,7 +315,7 @@ class update_payload(payload):
-         payload.__init__(self, arg)
-         self.blob_type = 0
-         self.entry_packing = '=40sIIII128s'
--        self.entry_tuple = ('', 0, 0, 0, 0, '')
-+        self.entry_tuple = (b'', 0, 0, 0, 0, b'')
-         self.param_c = 5
-         self.outfile = 'ota.blob'
- 
-@@ -331,7 +326,7 @@ class update_payload(payload):
- 
-             entry_info = self.entry_info_list[i]
-             if len(entry_info) != self.param_c:
--                print 'Invalid entry tuple:', entry_info
-+                print('Invalid entry tuple:', entry_info)
-                 return
- 
-             binary_name = payload.get_binary_name(self, entry_info[0])
-@@ -375,7 +370,7 @@ class update_payload(payload):
-             spec_info = entry_info[4]
-             offset = entry_update[0]
-             length = entry_update[1]
--            entry_tuple = (part_name, offset, length, version, op_mode, spec_info)
-+            entry_tuple = (part_name.encode('utf-8'), offset, length, version, op_mode, spec_info.encode('utf-8'))
-             updated_entry = struct.pack(self.entry_packing, *entry_tuple)
-             blob.write(updated_entry)
- 
-@@ -392,7 +387,7 @@ class bmp_payload(payload):
-         payload.__init__(self, arg)
-         self.blob_type = 1
-         self.entry_packing = '=IIII36s'
--        self.entry_tuple = (0, 0, 0, 0, '')
-+        self.entry_tuple = (0, 0, 0, 0, b'')
-         self.param_c = 3
-         self.outfile = 'bmp.blob'
- 
-@@ -404,7 +399,7 @@ class bmp_payload(payload):
- 
-             entry_info = self.entry_info_list[i]
-             if len(entry_info) != self.param_c:
--                print 'Invalid entry tuple:', entry_info
-+                print('Invalid entry tuple:', entry_info)
-                 return
- 
-             binary_name = payload.get_binary_name(self, entry_info[0])
-@@ -448,7 +443,7 @@ class inspect_update_payload(update_payl
+@@ -450,7 +450,7 @@ class inspect_update_payload(update_payl
          self.raw_extract_bin_list = arg.inspect_extract_bin_list
  
          self.blob_header_tuple = struct.unpack(self.header_packing, self.blob_file.read(struct.calcsize(self.header_packing)))
@@ -155,40 +39,7 @@ Index: Linux_for_Tegra/bootloader/BUP_generator.py
  
          # # Detect if optional accessory field (8 bytes) is present
          if self.blob_header_dict['header_size'] > struct.calcsize(self.header_packing):
-@@ -457,8 +452,8 @@ class inspect_update_payload(update_payl
- 
-         if not self._valid():
-             sys.stderr.write("Warning. Invalid input blob file. Results may be unexpected.\r\n" \
--                             "      Input magic: " + self.blob_header_dict['magic'] + "\r\n" \
--                             "   Expected magic: " + self.magic + "\r\n" \
-+                             "      Input magic: " + self.blob_header_dict['magic'].decode('utf-8') + "\r\n" \
-+                             "   Expected magic: " + self.magic.decode('utf-8') + "\r\n" \
-                              "    Input version: " + format(self.blob_header_dict['version'], "#010x") + "\r\n" \
-                              " Expected version: " + format(self.version, "#010x") + "\r\n" \
-                              "       Input type: " + str(self.blob_header_dict['type']) + "\r\n" \
-@@ -466,15 +461,15 @@ class inspect_update_payload(update_payl
-                             )
- 
-         if self.blob_header_dict['entry_count'] > arg.inspect_max_entries:
--            print
--            print "Blob header indicates " + str(self.blob_header_dict['entry_count']) + " partitions in this blob.\r\n" \
-+            print()
-+            print("Blob header indicates " + str(self.blob_header_dict['entry_count']) + " partitions in this blob.\r\n" \
-                   "Limiting display to the first " + str(arg.inspect_max_entries) + " partitions.\r\n" \
--                  "Use the '--max-entries' or '-m' option to specify otherwise."
--            self.blob_entry_list = range(arg.inspect_max_entries)
-+                  "Use the '--max-entries' or '-m' option to specify otherwise.")
-+            self.blob_entry_list = list(range(arg.inspect_max_entries))
-         else:
--            self.blob_entry_list = range(self.blob_header_dict['entry_count'])
-+            self.blob_entry_list = list(range(self.blob_header_dict['entry_count']))
- 
--        self.blob_entry_max_width_list = range(len(self.entry_name_tuple))
-+        self.blob_entry_max_width_list = list(range(len(self.entry_name_tuple)))
-         for i in range(len(self.blob_entry_max_width_list)):
-             self.blob_entry_max_width_list[i] = len(self.entry_name_tuple[i])
- 
-@@ -491,13 +486,17 @@ class inspect_update_payload(update_payl
+@@ -493,7 +493,7 @@ class inspect_update_payload(update_payl
          for idx, blob_entry in enumerate(self.blob_entry_list):
              try:
                  blob_entry_tuple = struct.unpack(self.entry_packing, self.blob_file.read(struct.calcsize(self.entry_packing)))
@@ -197,176 +48,47 @@ Index: Linux_for_Tegra/bootloader/BUP_generator.py
                  self.blob_entry_list[idx] = blob_entry_dict
  
                  for n in range(len(self.blob_entry_max_width_list)):
-                     try:
--                        if len(str(blob_entry_tuple[n]).strip(' \t\n\0')) > self.blob_entry_max_width_list[n]:
--                            self.blob_entry_max_width_list[n] = len(str(blob_entry_tuple[n]).strip(' \t\n\0'))
-+                        if n in [0, 5]:
-+                            val = blob_entry_tuple[n].decode('utf-8')
-+                        else:
-+                            val = str(blob_entry_tuple[n])
-+                        if len(val.strip(' \t\n\0')) > self.blob_entry_max_width_list[n]:
-+                            self.blob_entry_max_width_list[n] = len(val.strip(' \t\n\0'))
-                     except:
-                         pass
-             except:
-@@ -526,101 +525,62 @@ class inspect_update_payload(update_payl
-         return version
- 
-     def print_blob_header(self):
--        print "BLOB HEADER:"
--        print "       Magic: " + self.blob_header_dict['magic']
--        print "     Version: " + self.show_readable_version() \
--                               + " (" + format(self.blob_header_dict['version'], "#010x") + ")"
--        print "   Blob Size: " + "{:,}".format(self.blob_header_dict['blob_size']) + " bytes"
--        print " Header Size: " + "{:,}".format(self.blob_header_dict['header_size']) + " bytes"
--        print " Entry Count: " + str(self.blob_header_dict['entry_count']) + " partition(s)"
--        print "        Type: " + str(self.blob_header_dict['type']) + " (0 for update, 1 for BMP)"
--        print "Uncompressed\r\n" \
--              "   Blob Size: " + "{:,}".format(self.blob_header_dict['uncomp_blob_size']) + " bytes"
--        print "   Accessory:",
-+        print("BLOB HEADER:")
-+        print("       Magic: " + self.blob_header_dict['magic'].decode('utf-8'))
-+        print("     Version: " + self.show_readable_version() \
-+                               + " (" + format(self.blob_header_dict['version'], "#010x") + ")")
-+        print("   Blob Size: " + "{:,}".format(self.blob_header_dict['blob_size']) + " bytes")
-+        print(" Header Size: " + "{:,}".format(self.blob_header_dict['header_size']) + " bytes")
-+        print(" Entry Count: " + str(self.blob_header_dict['entry_count']) + " partition(s)")
-+        print("        Type: " + str(self.blob_header_dict['type']) + " (0 for update, 1 for BMP)")
-+        print("Uncompressed\r\n" \
-+              "   Blob Size: " + "{:,}".format(self.blob_header_dict['uncomp_blob_size']) + " bytes")
-+        print("   Accessory:",)
-         if self.accessory_present == True:
--            print format(self.blob_header_dict['accessory'], "#018x")
-+            print(format(self.blob_header_dict['accessory'], "#018x"))
-         else:
--            print "Not Present"
-+            print("Not Present")
-         return
- 
-     def print_entry_table(self):
--        print "ENTRY TABLE:"
--        print "|",
-+        print("ENTRY TABLE:")
-+        print("|", end='')
-         for idx, entry_name in enumerate(self.entry_name_tuple):
--            print entry_name.center(self.blob_entry_max_width_list[idx]) + " |",
--        print
-+            print(entry_name.center(self.blob_entry_max_width_list[idx]) + " |", end='')
-+        print()
+@@ -578,8 +578,8 @@ class inspect_update_payload(update_payl
+         part_name_list = list()
+         spec_info_list = list()
          for blob_entry in self.blob_entry_list:
--            print "|",
-+            print("|", end='')
-             try:
--                print str(blob_entry['part_name']).strip(' \t\n\0').rjust(self.blob_entry_max_width_list[0]) + " |",
--                print str(blob_entry['offset']).rjust(self.blob_entry_max_width_list[1]) + " |",
--                print str(blob_entry['part_size']).rjust(self.blob_entry_max_width_list[2]) + " |",
--                print str("{:x}".format(blob_entry['version'])).center(self.blob_entry_max_width_list[3]) + " |",
--                print str(blob_entry['op_mode']).center(self.blob_entry_max_width_list[4]) + " |",
--                print str(blob_entry['tnspec']).strip(' \t\n\0').ljust(self.blob_entry_max_width_list[5]) + " |"
-+                print(blob_entry['part_name'].decode('utf-8').strip(' \t\n\0').rjust(self.blob_entry_max_width_list[0]) + " |", end='')
-+                print(str(blob_entry['offset']).rjust(self.blob_entry_max_width_list[1]) + " |", end='')
-+                print(str(blob_entry['part_size']).rjust(self.blob_entry_max_width_list[2]) + " |", end='')
-+                print(str("{:x}".format(blob_entry['version'])).center(self.blob_entry_max_width_list[3]) + " |", end='')
-+                print(str(blob_entry['op_mode']).center(self.blob_entry_max_width_list[4]) + " |", end='')
-+                print(blob_entry['tnspec'].decode('utf-8').strip(' \t\n\0').ljust(self.blob_entry_max_width_list[5]) + " |")
-             except:
--                print "SKIPPED".center(sum(self.blob_entry_max_width_list) + (len(self.blob_entry_max_width_list)*2) + 3) + " |"
-+                print("SKIPPED".center(sum(self.blob_entry_max_width_list) + (len(self.blob_entry_max_width_list)*2) + 3) + " |")
-                 pass
-         return
- 
-     def check_entry_table(self):
--        print "Checking entry table ..."
-+        print("Checking entry table ...")
- 
-         # Find out all partitions that have tnspec
-+        part_names = set([e['part_name'].decode('utf-8').strip(' \t\n\0') for e in self.blob_entry_list if len(e['tnspec'].decode('utf-8').strip(' \t\n\0')) > 0])
-         # Find out all tnspec
--        part_name_list = list()
--        spec_info_list = list()
--        for blob_entry in self.blob_entry_list:
 -            part_name = str(blob_entry['part_name']).strip(' \t\n\0')
 -            tnspec = str(blob_entry['tnspec']).strip(' \t\n\0')
--
--            if tnspec == "":
--                continue
--
--            if len(part_name_list):
--                for idx, name in enumerate(part_name_list):
--                    if name == part_name:
--                        break
--                    else:
--                        if idx == (len(part_name_list) - 1):
--                            part_name_list.append(part_name)
--                            break
--            else:
--                part_name_list.append(part_name)
--
--            if len(spec_info_list):
--                for idx, spec in enumerate(spec_info_list):
--                    if spec == tnspec:
--                        break
--                    else:
--                        if idx == (len(spec_info_list) - 1):
--                            spec_info_list.append(tnspec)
--                            break
--            else:
--                spec_info_list.append(tnspec)
-+        spec_names = set([e['tnspec'].decode('utf-8').strip(' \t\n\0') for e in self.blob_entry_list if len(e['tnspec'].decode('utf-8').strip(' \t\n\0')) > 0])
++            part_name = str(blob_entry['part_name'].decode('utf-8')).strip(' \t\n\0')
++            tnspec = str(blob_entry['tnspec'].decode('utf-8')).strip(' \t\n\0')
  
--        # Verify every entry in spec_info_list must have an entry in part_name_list
+             if tnspec == "":
+                 continue
+@@ -609,16 +609,16 @@ class inspect_update_payload(update_payl
+         # Verify every entry in spec_info_list must have an entry in part_name_list
          valid = True
--        for part in part_name_list:
+         for part in part_name_list:
 -            blob_entry = filter(lambda entry: (str(entry['part_name']).strip(' \t\n\0') == part), self.blob_entry_list)
--            blob_entry = copy.deepcopy(blob_entry)
--
--            for spec in spec_info_list:
--                found = False
--                for idx, entry in enumerate(blob_entry):
++            blob_entry = [entry for entry in self.blob_entry_list if (str(entry['part_name'].decode('utf-8')).strip(' \t\n\0') == part)]
+             blob_entry = copy.deepcopy(blob_entry)
+ 
+             for spec in spec_info_list:
+                 found = False
+                 for idx, entry in enumerate(blob_entry):
 -                    e_spec = str(entry['tnspec']).strip(' \t\n\0')
--                    if spec == e_spec:
--                        found = True
++                    e_spec = str(entry['tnspec'].decode('utf-8')).strip(' \t\n\0')
+                     if spec == e_spec:
+                         found = True
 -                        blob_entry.remove(blob_entry[idx])
--                        break
--                if (found == False):
--                    valid = False
--                    sys.stderr.write("Error: " + "The " + part + " missed SPEC " + spec + ".\r\n")
-+        for part in part_names:
-+            missing = spec_names - set([e['tnspec'].decode('utf-8').strip(' \t\n\0') for e in self.blob_entry_list if e['part_name'].decode('utf-8').strip(' \t\n\0') == part])
-+            if len(missing) > 0:
-+                print("Error: partition {} missing for SPECs {}".format(part, ', '.join(sorted(missing))), file=sys.stderr)
-+                valid = False
++                        del blob_entry[idx]
+                         break
+                 if (found == False):
+                     valid = False
+@@ -639,7 +639,7 @@ class inspect_update_payload(update_payl
  
--        if (valid == False):
-+        if not valid:
-             sys.exit(1)
-         else:
--            print "Check entry table successful"
-+            print("Check entry table successful")
- 
-     def extract_binaries(self):
-         extract_bin_list = [extract_bin.strip(' \t\n\0') for extract_bin in self.raw_extract_bin_list.split(';')]
-@@ -630,14 +590,14 @@ class inspect_update_payload(update_payl
-         out_ext = ".raw.bin"
-         out_delim = "_"
- 
--        print "Saving partitions to \"" + out_path + "\""
--        print "File names are of format \"<part_name>[" + out_delim + "<op_str>][" + out_delim + "<tnspec>]" + out_ext + "\""
+         print ("Saving partitions to \"" + out_path + "\"")
+         print ("File names are of format \"<part_name>[" + out_delim + "<op_str>][" + out_delim + "<tnspec>]" + out_ext + "\"")
 -        print
-+        print("Saving partitions to \"" + out_path + "\"")
-+        print("File names are of format \"<part_name>[" + out_delim + "<op_str>][" + out_delim + "<tnspec>]" + out_ext + "\"")
 +        print()
  
          for blob_entry in self.blob_entry_list:
--            part_name = str(blob_entry['part_name']).strip(' \t\n\0')
-+            part_name = blob_entry['part_name'].decode('utf-8').strip(' \t\n\0')
-             op_mode = blob_entry['op_mode']
--            tnspec = str(blob_entry['tnspec']).strip(' \t\n\0')
-+            tnspec = blob_entry['tnspec'].decode('utf-8').strip(' \t\n\0')
- 
-             if op_mode == 0:
-                 op_str = ""
-@@ -653,7 +613,7 @@ class inspect_update_payload(update_payl
+             part_name = str(blob_entry['part_name'].decode('utf-8')).strip(' \t\n\0')
+@@ -660,7 +660,7 @@ class inspect_update_payload(update_payl
  
              if (part_name in extract_bin_set) or ("all" in extract_bin_set):
                  # Binary will be saved to <OUT>/<part_name>[_<op_str>][_<tnspec>].raw.bin
@@ -375,12 +97,3 @@ Index: Linux_for_Tegra/bootloader/BUP_generator.py
                  binary_path = os.path.join(out_path, binary_name)
  
                  try:
-@@ -669,7 +629,7 @@ class inspect_update_payload(update_payl
-                 # from "offset" of the specified partition name
-                 save_file.write(self.blob_file.read(int(blob_entry['part_size'])))
- 
--                print "Saved file \"" + binary_name + "\""
-+                print("Saved file \"" + binary_name + "\"")
- 
-                 # Remove partition name that was just saved from the list of
-                 # missing binaries (e.g. in extraction list but not in payload)

recipes-bsp/tegra-binaries/files/0005-Convert-rollback_parser.py-to-Python3.patch

@@ -1,60 +0,0 @@
-From baf78155424a2f00cce4653470b2dad73fe74689 Mon Sep 17 00:00:00 2001
-From: Matt Madison <matt@madison.systems>
-Date: Sat, 25 Apr 2020 05:15:47 -0700
-Subject: [PATCH] Convert rollback_parser.py to Python3
-
----
- bootloader/rollback/rollback_parser.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/bootloader/rollback/rollback_parser.py b/bootloader/rollback/rollback_parser.py
-index 9794660..78ea465 100755
---- a/bootloader/rollback/rollback_parser.py
-+++ b/bootloader/rollback/rollback_parser.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python3
- #
- # Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
- #
-@@ -13,7 +13,7 @@ import sys
- import os
- import string
- import struct
--import ConfigParser
-+import configparser
- import argparse
- 
- params = {}
-@@ -31,7 +31,7 @@ def parse_args():
-     params = parser.parse_args()
- 
- def main():
--    rollback = ConfigParser.ConfigParser()
-+    rollback = configparser.ConfigParser()
-     rollback.read(params.config)
- 
-     rlbk_list = ['mb1_ratchet_level', 'mts_ratchet_level', 'rollback_fuse_level']
-@@ -39,19 +39,19 @@ def main():
-                     'rollback_fuse_level': '=B'}
- 
-     blob = open(params.output, "wb")
--    print 'rollback info is parsed and saved in', params.output
-+    print('rollback info is parsed and saved in', params.output)
- 
-     for e in rlbk_list:
-         try:
-             level = rollback.getint(params.target, e)
-         except:
--            print 'WARNING: failed to find rollback config for \"', params.target, '\"'
-+            print('WARNING: failed to find rollback config for \"', params.target, '\"')
-             break
-         bin_value = struct.pack(packing_list[e], level)
-         blob.write(bin_value)
- 
-     # pad zeros
--    print 'pad ZEROs to the end of', params.output
-+    print('pad ZEROs to the end of', params.output)
-     pad_value = struct.pack("=B", 0)
-     for i in range(blob.tell(), ROLLBACK_BIN_SIZE):
-         blob.write(pad_value)

recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra-binaryonly_35.2.1.bb

@@ -13,7 +13,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-gstreamer"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "16b2b02bcd3f0a4dce9c0a85976c5e0345e7e5af17a8ecab4fdf40797a5f74a0"
+MAINSUM = "76567c73f13ddf0cc837caa5c143bcf447b5667f28e18a7108df10868476f4b0"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     libgstnvegl-1.0.so.0 \

recipes-bsp/tegra-binaries/libdrm-nvdc_35.2.1.bb

@@ -7,8 +7,8 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-core"
 require tegra-debian-libraries-common.inc
 
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'weston')};subdir=${BP};name=weston"
-MAINSUM = "26463537a9d0b0438c89cbdabc3242d8e73410f023ed1d11ceb40a18e49b4fd7"
-SRC_URI[weston.sha256sum] = "6de41727198b848e1c404473e3ca30be183bc9667059c96e9f14774fa14689a2"
+MAINSUM = "1f859d400c4d4bc0a41119bee18074d48d8fa3396a5adf521b0182b08be2d5ab"
+SRC_URI[weston.sha256sum] = "cd731ee675f9b02ec84f15a79d11dd6b064180618c61b013931aaeaaf4528b13"
 
 do_compile() {
     echo "${libdir}/tegra" > ${B}/tegra.conf

recipes-bsp/tegra-binaries/nv-tegra-release_35.2.1.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "26463537a9d0b0438c89cbdabc3242d8e73410f023ed1d11ceb40a18e49b4fd7"
+MAINSUM = "1f859d400c4d4bc0a41119bee18074d48d8fa3396a5adf521b0182b08be2d5ab"
 
 INHIBIT_DEFAULT_DEPS = "1"
 

recipes-bsp/tegra-binaries/nvidia-l4t-optee_35.2.1.bb

@@ -3,7 +3,7 @@ L4T_DEB_COPYRIGHT_MD5 = "38ef63b8f3232378d9f652f640ee0a3f"
 require tegra-debian-libraries-common.inc
 
 DESCRIPTION = "Prebuilt OPTEE normal-world binaries"
-MAINSUM = "e2468b00cae45db096aef67173ef86ddca421ee5db8a54d6096eccdc047a8ed3"
+MAINSUM = "7f7c120849696957b432f9c280a905d957dc634bffac22444469d583f21e393d"
 
 inherit systemd
 

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

@@ -3,10 +3,8 @@ LIC_FILES_CHKSUM = "file://nv_tegra/LICENSE;md5=2cc00be68c1227a7c42ff3620ef75d05
                     file://nv_tegra/LICENSE.brcm_patchram_plus;md5=38fb07f0dacf4830bc57f40a0fb7532e"
 
 
-SRC_URI = "${L4T_URI_BASE}/${L4T_BSP_PREFIX}_Linux_R${L4T_VERSION}_aarch64.tbz2;name=l4t \
-	   ${L4T_URI_BASE}/secureboot_R${L4T_VERSION}_aarch64.tbz2;downloadfilename=${L4T_BSP_PREFIX}_secureboot_${L4T_VERSION}.tbz2;name=sb"
-SRC_URI[l4t.sha256sum] = "670021f6a288b8ea916fd4089fbdde9ab8dd5003f23079aaf439424b35de454c"
-SRC_URI[sb.sha256sum] = "a5d4b16b50e93c8f2bd2104f7dd6ec07f0f7665f58dc988e114eed174d57ed78"
+SRC_URI = "${L4T_URI_BASE}/${L4T_BSP_PREFIX}_Linux_R${L4T_VERSION}_aarch64.tbz2"
+SRC_URI[sha256sum] = "9959bcd3de79de231a8fb54119f9cdb57a753542d44d994e346664028142d40d"
 
 inherit l4t_bsp
 

recipes-bsp/tegra-binaries/tegra-bootfiles_35.2.1.bb

@@ -18,7 +18,6 @@ BOOTBINS:tegra194 = "\
     bpmp-2_t194.bin \
     camera-rtcpu-t194-rce.img \
     dram-ecc-t194.bin \
-    eks.img \
     mb1_t194_prod.bin \
     nvdisp-init.bin \
     nvtboot_applet_t194.bin \
@@ -38,7 +37,6 @@ BOOTBINS:tegra234 = "\
     applet_t234.bin \
     ${BPF_FILE} \
     camera-rtcpu-t234-rce.img \
-    eks.img \
     mb1_t234_prod.bin \
     mb2_t234.bin \
     mb2rf_t234.bin \
@@ -58,7 +56,6 @@ BOOTBINS:tegra234 = "\
     tegrabl_carveout_id.h \
     pinctrl-tegra.h \
     tegra234-gpio.h \
-    gpio.h \
     readinfo_t234_min_prod.xml \
     camera-rtcpu-sce.img \
 "
@@ -116,6 +113,7 @@ do_install() {
 }
 
 do_install:append:tegra194() {
+    install -m 0644 ${S}/bootloader/eks_t194.img ${D}${datadir}/tegraflash/eks.img
     install -m 0644 ${B}/nvdisp-init.bin ${D}${datadir}/tegraflash/
     install -m 0644 ${BCT_OVERRIDE_TEMPLATE} ${D}${datadir}/tegraflash/${EMMC_BCT_OVERRIDE}
     install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/BCT/tegra19* ${D}${datadir}/tegraflash/
@@ -127,9 +125,11 @@ do_install:append:tegra194() {
 }
 
 do_install:append:tegra234() {
+    install -m 0644 ${S}/bootloader/eks_t234.img ${D}${datadir}/tegraflash/eks.img
     install -m 0644 ${S}/bootloader/tegra234-*.dts* ${D}${datadir}/tegraflash/
     install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/tegra234-bpmp-*.dtb ${D}${datadir}/tegraflash/
     install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/BCT/tegra234* ${D}${datadir}/tegraflash/
+    install -m 0644 ${S}/bootloader/bpmp_t234-*.bin ${D}${datadir}/tegraflash/
 }
 
 PACKAGES = "${PN}-dev"

recipes-bsp/tegra-binaries/tegra-brcm-patchram_35.2.1.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 = "ad2dd6671a42307dedfc477a805f4b5e6b0117d53e02eb06a8b7133e95d38d39"
+MAINSUM = "f1b9380bf41142ba75a357aaf61223c527519714ceb9102576fc66dda010f7b2"
 
 do_install() {
     install -d ${D}${sbindir}

recipes-bsp/tegra-binaries/tegra-configs-alsa_35.2.1.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-init"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "9a7b2a92b8900af7d47a6d1f9e2c3c00e6fe78184c0bd02a8edfa72dcd2fa74b"
+MAINSUM = "36b53071e126e9ddf6017e745f47165727ff1c7eb1eedea53a0aec41363dc044"
 
 do_install() {
     if [ -n "${TEGRA_AUDIO_DEVICE}" ]; then

recipes-bsp/tegra-binaries/tegra-configs/l4t.csv

@@ -27,6 +27,7 @@ dev, /dev/nvhost-nvdla0
 dev, /dev/nvhost-nvdla1
 dev, /dev/nvhost-nvenc1
 dev, /dev/nvhost-nvjpg
+dev, /dev/nvhost-nvjpg1
 dev, /dev/nvhost-ofa
 dev, /dev/nvhost-prof-gpu
 dev, /dev/nvhost-pva0
@@ -38,7 +39,7 @@ dev, /dev/tegra_dc_0
 dev, /dev/tegra_dc_1
 dev, /dev/tegra_dc_ctrl
 dir, /lib/firmware/tegra19x
-lib, /lib/firmware/tegra19x/nvhost_nvdec040_ns.fw
+lib, //lib/firmware/tegra19x/nvhost_nvdec040_ns.fw
 lib, /lib/firmware/tegra19x/nvhost_nvdec040_ns.fw
 lib, /lib/firmware/tegra23x/nvhost_nvdec050_desc_prod.bin
 lib, /usr/bin/weston
@@ -88,6 +89,7 @@ lib, /usr/lib/libGLESv1_CM_nvidia.so.1
 lib, /usr/lib/libGLESv2_nvidia.so.2
 lib, /usr/lib/libGLX_nvidia.so.0
 lib, /usr/lib/libgstnvegl-1.0.so.0
+lib, /usr/lib/libgstnvdsseimeta.so.1.0.0
 lib, /usr/lib/libgstnvexifmeta.so
 lib, /usr/lib/libgstnvivameta.so
 lib, /usr/lib/libjetsonpower.so
@@ -105,7 +107,7 @@ lib, /usr/lib/libnvcamlog.so
 lib, /usr/lib/libnvcamv4l2.so
 lib, /usr/lib/libnvcapture.so
 lib, /usr/lib/libnvcolorutil.so
-lib, /usr/lib/libnvcucompat.so.35.1.0
+lib, /usr/lib/libnvcucompat.so.35.2.1
 lib, /usr/lib/libnvcuvidv4l2.so
 lib, /usr/lib/libnvdc.so
 lib, /usr/lib/libnvddk_2d_v2.so
@@ -123,7 +125,6 @@ lib, /usr/lib/libnvfnetstoredefog.so
 lib, /usr/lib/libnvfnetstorehdfx.so
 lib, /usr/lib/libnvfusacapinterface.so
 lib, /usr/lib/libnvfusacap.so
-lib, /usr/lib/libnvgbm.so
 lib, /usr/lib/libnvgov_boot.so
 lib, /usr/lib/libnvgov_camera.so
 lib, /usr/lib/libnvgov_force.so
@@ -135,15 +136,17 @@ lib, /usr/lib/libnvgov_spincircle.so
 lib, /usr/lib/libnvgov_tbc.so
 lib, /usr/lib/libnvgov_ui.so
 lib, /usr/lib/libnvidia-allocator.so.1
-lib, /usr/lib/libnvidia-eglcore.so.35.1.0
+lib, /usr/lib/libnvidia-eglcore.so.35.2.1
 lib, /usr/lib/libnvidia-egl-gbm.so
 lib, /usr/lib/libnvidia-egl-wayland.so
-lib, /usr/lib/libnvidia-glcore.so.35.1.0
-lib, /usr/lib/libnvidia-glsi.so.35.1.0
-lib, /usr/lib/libnvidia-glvkspirv.so.35.1.0
-lib, /usr/lib/libnvidia-ptxjitcompiler.so.35.1.0
-lib, /usr/lib/libnvidia-rmapi-tegra.so.35.1.0
-lib, /usr/lib/libnvidia-tls.so.35.1.0
+lib, /usr/lib/libnvidia-glcore.so.35.2.1
+lib, /usr/lib/libnvidia-glsi.so.35.2.1
+lib, /usr/lib/libnvidia-glvkspirv.so.35.2.1
+lib, /usr/lib/libnvidia-nvvm.so.35.2.1
+lib, /usr/lib/libnvidia-ptxjitcompiler.so.35.2.1
+lib, /usr/lib/libnvidia-rmapi-tegra.so.35.2.1
+lib, /usr/lib/libnvidia-rtcore.so.35.2.1
+lib, /usr/lib/libnvidia-tls.so.35.2.1
 lib, /usr/lib/libnvidia-vulkan-producer.so
 lib, /usr/lib/libnvid_mapper.so.1.0.0
 lib, /usr/lib/libnvimp.so
@@ -158,6 +161,14 @@ lib, /usr/lib/libnvmedia_dla.so
 lib, /usr/lib/libnvmedia_isp_ext.so
 lib, /usr/lib/libnvmedialdc.so
 lib, /usr/lib/libnvmedia.so
+lib, /usr/lib/libnvmedia_eglstream.so
+lib, /usr/lib/libnvmedia_ide_parser.so
+lib, /usr/lib/libnvmedia_ide_sci.so
+lib, /usr/lib/libnvmedia_iep_sci.so
+lib, /usr/lib/libnvmedia_ijpd_sci.so
+lib, /usr/lib/libnvmedia_ijpe_sci.so
+lib, /usr/lib/libnvmedia_iofa_sci.so
+lib, /usr/lib/libnvmedia_sci_overlay.so
 lib, /usr/lib/libnvmedia_tensor.so
 lib, /usr/lib/libnvmm_contentpipe.so
 lib, /usr/lib/libnvmmlite_image.so
@@ -169,6 +180,9 @@ lib, /usr/lib/libnvmm.so
 lib, /usr/lib/libnvmm_utils.so
 lib, /usr/lib/libnvodm_imager.so
 lib, /usr/lib/libnvofsdk.so
+lib, /usr/lib/libnvoggopus.so
+lib, /usr/lib/libnvomxilclient.so
+lib, /usr/lib/libnvomx.so
 lib, /usr/lib/libnvosd.so
 lib, /usr/lib/libnvos.so
 lib, /usr/lib/libnvparser.so
@@ -215,8 +229,12 @@ lib, /usr/lib/weston/desktop-shell.so
 lib, /usr/lib/weston/fullscreen-shell.so
 lib, /usr/lib/weston/hmi-controller.so
 lib, /usr/lib/weston/ivi-shell.so
+sym, /usr/lib/gbm/nvidia-drm_gbm.so
+sym, /usr/lib/gbm/tegra-udrm_gbm.so
 sym, /usr/lib/gbm/tegra_gbm.so
 sym, /usr/lib/libcuda.so
+sym, /usr/lib/libcuda.so.1
+sym, /usr/lib/libgstnvdsseimeta.so
 sym, /usr/lib/libgstreamer-1.0.so.0
 sym, /usr/lib/libnvbufsurface.so
 sym, /usr/lib/libnvbufsurftransform.so
@@ -224,6 +242,11 @@ sym, /usr/lib/libnvbuf_utils.so
 sym, /usr/lib/libnvcucompat.so
 sym, /usr/lib/libnvdsbufferpool.so
 sym, /usr/lib/libnvidia-allocator.so
+sym, /usr/lib/libnvidia-egl-gbm.so.1
+sym, /usr/lib/libnvidia-egl-wayland.so.1
+sym, /usr/lib/libnvidia-kms.so
+sym, /usr/lib/libnvidia-nvvm.so.4
+sym, /usr/lib/libnvidia-ptxjitcompiler.so.1
 sym, /usr/lib/libnvid_mapper.so
 sym, /usr/lib/libnvscibuf.so
 sym, /usr/lib/libnvscicommon.so

recipes-bsp/tegra-binaries/tegra-configs_35.2.1.bb

@@ -10,9 +10,9 @@ SRC_SOC_DEBS += "\
     ${@l4t_deb_pkgname(d, 'x11')};subdir=${BP};name=x11 \
 "
 
-MAINSUM = "0afdf6258ee4e45b074f591a8035404ac815c68b89cb42f081fc8b9c32d1ec52"
-INITSUM = "9a7b2a92b8900af7d47a6d1f9e2c3c00e6fe78184c0bd02a8edfa72dcd2fa74b"
-X11SUM = "69dad44da79d31d34264b01c4f3539e1b2e4ce8d45e52ddb0997273881f47bd6"
+MAINSUM = "c3915148b3fe257c4a6d068d005b76fdce3e81e3f5e61bd86cb1697a35b09b3b"
+INITSUM = "36b53071e126e9ddf6017e745f47165727ff1c7eb1eedea53a0aec41363dc044"
+X11SUM = "7137ddc8c9a5a2565a336fdf58039a106d5994d4fc3f118b453262cba77b80ca"
 SRC_URI[init.sha256sum] = "${INITSUM}"
 SRC_URI[x11.sha256sum] = "${X11SUM}"
 

recipes-bsp/tegra-binaries/tegra-firmware_35.2.1.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 = "ad2dd6671a42307dedfc477a805f4b5e6b0117d53e02eb06a8b7133e95d38d39"
-XUSBSUM = "6bcdda8cd577feaab54aeee44612055d2d5d9e93539c99e31af45833d5bf1aa0"
+MAINSUM = "f1b9380bf41142ba75a357aaf61223c527519714ceb9102576fc66dda010f7b2"
+XUSBSUM = "635131c6629b88b69e0981943ae1af3e7bfd71311afd01b1d4f024293d2a226b"
 SRC_URI[xusb.sha256sum] = "${XUSBSUM}"
 
 do_install() {

recipes-bsp/tegra-binaries/tegra-flashtools-native_35.2.1.bb

@@ -8,7 +8,6 @@ STAMPCLEAN = "${STAMPS_DIR}/work-shared/L4T-native-${PV}-*"
 SRC_URI += "\
            file://0003-Convert-BUP_generator.py-to-Python3.patch \
            file://0004-Convert-gen_tos_part_img.py-to-Python3.patch \
-           file://0005-Convert-rollback_parser.py-to-Python3.patch \
            file://0009-Remove-xxd-dependency-from-l4t_sign_image.sh.patch \
            file://0010-Rework-logging-in-l4t_sign_image.sh.patch \
            file://0013-Fix-location-of-bsp_version-file-in-l4t_bup_gen.func.patch \
@@ -52,6 +51,7 @@ do_install() {
     sed -i -e's,^#!/usr/bin/perl,#!/usr/bin/env perl,' ${D}${BINDIR}/sw_memcfg_overlay.pl
     install -m 0755 ${S}/bootloader/BUP_generator.py ${D}${BINDIR}
     install -m 0755 ${S}/bootloader/rollback/rollback_parser.py ${D}${BINDIR}
+    sed -i -e's,^#!.*,#!/usr/bin/env python3,' ${D}${BINDIR}/rollback_parser.py
     install -m 0644 ${S}/bootloader/l4t_bup_gen.func ${D}${BINDIR}
 
     install -m 0644 ${S}/bootloader/odmsign.func ${D}${BINDIR}
@@ -59,11 +59,6 @@ do_install() {
     install -m 0755 ${S}/bootloader/mksparse ${D}${BINDIR}
     install -m 0755 ${S}/bootloader/mkbootimg ${D}${BINDIR}
 
-    install -d ${D}${BINDIR}/pkc
-    install -m 0755 ${S}/pkc/mkpkc ${D}${BINDIR}/pkc/
-    install -m 0755 ${S}/pkc/nvsecuretool ${D}${BINDIR}/pkc/
-    install -m 0755 ${S}/bootloader/tegrakeyhash ${D}${BINDIR}
-
     install -m 0755 ${S}/nv_tegra/tos-scripts/gen_tos_part_img.py ${D}${BINDIR}
 
     install -m 0755 ${S}/l4t_sign_image.sh ${D}${BINDIR}

recipes-bsp/tegra-binaries/tegra-flashvars/jetson-agx-orin-devkit/flashvars

@@ -15,10 +15,10 @@ BLDTB="tegra234-p3701-0000-p3737-0000.dtb"
 MISC_CONFIG="tegra234-mb1-bct-misc-p3701-0000.dts"
 MINRATCHET_CONFIG=""
 UPHY_CONFIG=""
-BPF_FILE="@BPF_FILE@"
-BPFDTB_FILE="@BPFDTB_FILE@"
-TBCDTB_FILE="@TBCDTB_FILE@"
-WB0SDRAM_BCT="@WB0SDRAM_BCT@"
+BPF_FILE="bpmp_t234-TE990M-A1_prod.bin"
+BPFDTB_FILE="tegra234-bpmp-3701-0000-3737-0000.dtb"
+TBCDTB_FILE="tegra234-p3701-0000-p3737-0000.dtb"
+WB0SDRAM_BCT="tegra234-p3701-0000-wb0sdram-l4t.dts"
 OVERLAY_DTB_FILE="@OVERLAY_DTB_FILE@"
 SCR_CONFIG="tegra234-mb2-bct-scr-p3701-0000.dts"
 EMC_FUSE_DEV_PARAMS="tegra234-br-bct-diag-boot.dts"

recipes-bsp/tegra-binaries/tegra-helper-scripts/brcid-to-uid.py

@@ -70,21 +70,12 @@ def br_cid_to_linux_uid(brcid):
     logging.info("X:      0x%x" % fuse_x)
     logging.info("Y:      0x%x" % fuse_y)
 
-    # N.B. The Linux driver (in both 4.9 and 5.10) has a
-    # bug that reuses the fuse_y value instead of the
-    # fuse_wafer value at bit offset 18 here (a typo in the
-    # FUSE_OPT_WAFER_ID definition using register 0x118
-    # instead of the correct 0x110), which is why there
-    # are two fuse_y references below.
-    #
-    # Also note that the Linux driver only uses the lot0
-    # field, and ignores lot1.
     linux_uid = (
         (linux_chip << 60) |
         ((fuse_vendor & 0xf) << 56) |
         ((fuse_fab & 0x3f) << 50) |
         ((recode_lot0(fuse_lot0) & 0x3ffffff) << 24) |
-        ((fuse_y & 0x3f) << 18) |
+        ((fuse_wafer & 0x3f) << 18) |
         ((fuse_x & 0x1ff) << 9) |
         (fuse_y & 0x1ff))
 

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

@@ -260,17 +260,23 @@ if [ -z "$FAB" -o -z "$BOARDID" ]; then
     have_boardinfo="yes"
 fi
 
-if [ -z "$CHIP_SKU" ]; then
-    # see DEFAULT_CHIP_SKU in p3701.conf.common
-    CHIP_SKU="00:00:00:D0"
-fi
-
 if [ -n "$BOARDID" ]; then
     boardid="$BOARDID"
 else
     boardid=`$here/chkbdinfo -i ${cvm_bin} | tr -d '[:space:]'`
     BOARDID="$boardid"
 fi
+
+if [ -z "$CHIP_SKU" ]; then
+    # see DEFAULT_CHIP_SKU in p3701.conf.common
+    # or DFLT_CHIP_SKU in p3767.conf.common
+    if [ "$BOARDID" = "3767" ]; then
+	CHIP_SKU="00:00:00:D3"
+    else
+	CHIP_SKU="00:00:00:D0"
+    fi
+fi
+
 if [ -n "$FAB" ]; then
     board_version="$FAB"
 else
@@ -329,30 +335,54 @@ else
     chip_sku=$CHIP_SKU
 fi
 
-case $chip_sku in
-    00)
+if [ "$BOARDID" = "3701" ]; then
+    case $chip_sku in
+	00)
         ;;
-    90|97|9E)
-        BPF_FILE=$(echo "$BPF_FILE" | sed -e"s,T.*-A1,TA990SA-A1,")
-        ;;
-    D0|D2)
-        BPF_FILE=$(echo "$BPF_FILE" | sed -e"s,T.*-A1,TE990M-A1,")
-        ;;
-    *)
-        echo "ERR: unrecognized chip SKU: $chip_sku" >&2
-        exit 1
-        ;;
-esac
-
-if [ "$chip_sku" = "00" -o "$chip_sku" = "D0" ] &&
-       echo "$FAB" | egrep -q '^(TS[123]|EB[123]|[012]00)$'; then
-    PINMUX_CONFIG="tegra234-mb1-bct-pinmux-p3701-0000.dtsi"
-    PMC_CONFIG="tegra234-mb1-bct-padvoltage-p3701-0000.dtsi"
-fi
-
-if [ "$BOARDID" = "3701" -a "$BOARDSKU" != "0000" ]; then
-    BPFDTB_FILE=$(echo "$BPFDTB_FILE" | sed -e"s,p3701-0000,p3701-$BOARDSKU,")
-    dtb_file=$(echo "$dtb_file" | sed -e"s,p3701-0000,p3701-$BOARDSKU,")
+	90|97|9E)
+            BPF_FILE=$(echo "$BPF_FILE" | sed -e"s,T.*-A1,TA990SA-A1,")
+            ;;
+	D0|D2)
+            BPF_FILE=$(echo "$BPF_FILE" | sed -e"s,T.*-A1,TE990M-A1,")
+            ;;
+	*)
+            echo "ERR: unrecognized chip SKU: $chip_sku" >&2
+            exit 1
+            ;;
+    esac
+    if [ "$chip_sku" = "00" -o "$chip_sku" = "D0" ] &&
+	   echo "$FAB" | egrep -q '^(TS[123]|EB[123]|[012]00)$'; then
+	PINMUX_CONFIG="tegra234-mb1-bct-pinmux-p3701-0000.dtsi"
+	PMC_CONFIG="tegra234-mb1-bct-padvoltage-p3701-0000.dtsi"
+    fi
+    if [  "$BOARDSKU" != "0000" ]; then
+	BPFDTB_FILE=$(echo "$BPFDTB_FILE" | sed -e"s,3701-0000,3701-$BOARDSKU,")
+	dtb_file=$(echo "$dtb_file" | sed -e"s,p3701-0000,p3701-$BOARDSKU,")
+    fi
+elif [ "$BOARDID" = "3767" ]; then
+    PINMUXREV="a03"
+    BPFDTBREV="a02"
+    PMCREV="a03"
+    PMICREV="a02"
+    if [ "$BOARDSKU" = "0000" -o "$BOARDSKU" = "0002" ]; then
+        if [ "$FAB" = "TS1" -o "$FAB" = "EB1" ]; then
+	    PINMUXREV="a01"
+	    BPFDTBREV="a00"
+	    PMCREV="a01"
+	    PMICREV="a00"
+	fi
+    fi
+    if [ "$BOARDSKU" = "0001" -o "$BOARDSKU" = "0003" -o "$BOARDSKU" = "0005" ]; then
+	EMMC_BCT="tegra234-p3767-0001-sdram-l4t.dts"
+	WB0SDRAM_BCT="tegra234-p3767-0001-wb0sdram-l4t.dts"
+    fi
+    if [ "$BOARDSKU" = "0003" -o "$BOARDSKU" = "0004" -o "$BOARDSKU" = "0005" ]; then
+	BPF_FILE="bpmp_t234-TE950M-A1_prod.bin"
+    fi
+    PINMUX_CONFIG=$(echo "$PINMUX_CONFIG" | sed -e"s,@PINMUXREV@,$PINMUXREV,")
+    PMC_CONFIG=$(echo "$PMC_CONFIG" | sed -e"s,@PMCREV@,$PMCREV,")
+    PMIC_CONFIG=$(echo "$PMIC_CONFIG" | sed -e"s,@PMICREV@,$PMICREV,")
+    BPFDTB_FILE=$(echo "$BPFDTB_FILE" | sed -e"s,@BPFDTBREV@,$BPFDTBREV,")
 fi
 
 if [ "${fuselevel}" = "fuselevel_production" ]; then
@@ -416,7 +446,7 @@ else
     cp "$flash_in" flash.xml.tmp
 fi
 sed -e"s,VERFILE,${MACHINE}_bootblob_ver.txt," -e"s,BPFDTB_FILE,$BPFDTB_FILE," \
-    -e"s,TBCDTB-FILE,$dtb_file," -e"s, DTB_FILE,$kernel_dtbfile," \
+    -e"s, DTB_FILE,$kernel_dtbfile," -e"s,BPFFILE,$BPF_FILE," \
     $appfile_sed flash.xml.tmp > flash.xml
 rm flash.xml.tmp
 
@@ -444,6 +474,7 @@ custinfo_args=
 if [ -f "$custinfo_out" ]; then
     custinfo_args="--cust_info $custinfo_out"
 fi
+
 bctargs="$UPHY_CONFIG $MINRATCHET_CONFIG \
          --device_config $DEVICE_CONFIG \
          --misc_config $MISC_CONFIG \

recipes-bsp/tegra-binaries/tegra-libraries-camera_35.2.1.bb

@@ -12,9 +12,9 @@ LIC_FILES_CHKSUM += "\
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'gstreamer')};subdir=${BP};name=gstreamer"
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'core')};subdir=${BP};name=core"
 
-MAINSUM = "4867ffd8c89dda618a2b22e5469eddb58091f3867d4328dbef2d072228a1a994"
-GSTSUM = "16b2b02bcd3f0a4dce9c0a85976c5e0345e7e5af17a8ecab4fdf40797a5f74a0"
-CORESUM = "26463537a9d0b0438c89cbdabc3242d8e73410f023ed1d11ceb40a18e49b4fd7"
+MAINSUM = "b6f5c02926388fc3fc4ff3b3ad4c123a4f5eaec8313b047b4fc91a27e5205274"
+GSTSUM = "76567c73f13ddf0cc837caa5c143bcf447b5667f28e18a7108df10868476f4b0"
+CORESUM = "1f859d400c4d4bc0a41119bee18074d48d8fa3396a5adf521b0182b08be2d5ab"
 SRC_URI[gstreamer.sha256sum] = "${GSTSUM}"
 SRC_URI[core.sha256sum] = "${CORESUM}"
 

recipes-bsp/tegra-binaries/tegra-libraries-core_35.2.1.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 = "26463537a9d0b0438c89cbdabc3242d8e73410f023ed1d11ceb40a18e49b4fd7"
+MAINSUM = "1f859d400c4d4bc0a41119bee18074d48d8fa3396a5adf521b0182b08be2d5ab"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra/libnvcolorutil.so \

recipes-bsp/tegra-binaries/tegra-libraries-cuda_35.2.1.bb

@@ -4,13 +4,14 @@ DEPENDS = "tegra-libraries-core"
 require tegra-debian-libraries-common.inc
 
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, '3d-core')};subdir=${BP};name=core3d"
-MAINSUM = "e09f4760d5743c79773e4fcf0a75c8534a8d50b3816d548b91fdb19634335850"
-CORE3DSUM = "327062086957dca7cc1c73208202654bc303946f1f70125b4e8491a5bba11ff9"
+MAINSUM = "e5384b2f5dc8850e8350be284592997f63865d0ec4344239a6dba5c29a7667f6"
+CORE3DSUM = "aeab37657f0d0b801090adf8e5b17a8b86b86a6848a1e4cc333a7d3572eebab6"
 SRC_URI[core3d.sha256sum] = "${CORE3DSUM}"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra/libcuda.so.1.1 \
     tegra/libnvidia-ptxjitcompiler.so.${L4T_VERSION} \
+    tegra/libnvidia-nvvm.so.${L4T_VERSION} \
 "
 
 do_install() {
@@ -18,6 +19,8 @@ do_install() {
     ln -sf libcuda.so.1.1 ${D}${libdir}/libcuda.so
     ln -sf libcuda.so.1.1 ${D}${libdir}/libcuda.so.1
     ln -sf libnvidia-ptxjitcompiler.so.${L4T_VERSION} ${D}${libdir}/libnvidia-ptxjitcompiler.so.1
+    ln -sf libnvidia-nvvm.so.${L4T_VERSION} ${D}${libdir}/libnvidia-nvvm.so.4
+    ln -sf libnvidia-nvvm.so.${L4T_VERSION} ${D}${libdir}/libnvidia-nvvm.so
 
     # This is done to fix docker passthroughs
     # libnvcucompat.so is part of base passthrough and will get mounted to /usr/lib/aarch64-linux-gnu

recipes-bsp/tegra-binaries/tegra-libraries-eglcore_35.2.1.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-3d-core"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "327062086957dca7cc1c73208202654bc303946f1f70125b4e8491a5bba11ff9"
+MAINSUM = "aeab37657f0d0b801090adf8e5b17a8b86b86a6848a1e4cc333a7d3572eebab6"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra-egl/libEGL_nvidia.so.0 \
@@ -13,6 +13,7 @@ TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra/libnvidia-glsi.so.${L4T_VERSION} \
     tegra/libnvidia-glvkspirv.so.${L4T_VERSION} \
     tegra/libnvidia-rmapi-tegra.so.${L4T_VERSION} \
+    tegra/libnvidia-rtcore.so.${L4T_VERSION} \
 "
 
 do_install() {

recipes-bsp/tegra-binaries/tegra-libraries-gbm-backend_35.2.1.bb

@@ -1,11 +1,11 @@
 L4T_DEB_COPYRIGHT_MD5 = "20c2079c67a62b1d526f2a494b57586c"
-DEPENDS = "tegra-libraries-gbm tegra-libraries-eglcore"
+DEPENDS = "tegra-libraries-eglcore"
 
 L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-gbm"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "b5fe862241eeac1535e7e658c04946c2c02fd192e69361378b543ae1d9c43065"
+MAINSUM = "05643d40c44687eec78089936a4f8882ab9f1217f1f2870c4342a1cebf10f367"
 
 RPROVIDES:${PN} += "tegra-gbm-backend"
 

recipes-bsp/tegra-binaries/tegra-libraries-gbm_35.1.0.bb

@@ -1,26 +0,0 @@
-L4T_DEB_COPYRIGHT_MD5 = "fab0c15b4bbf7f8d5ac2bd6673d4211c"
-DEPENDS = "libdrm patchelf-native"
-
-L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-core"
-
-require tegra-debian-libraries-common.inc
-
-LICENSE += "& BSD-3-Clause"
-LIC_FILES_CHKSUM += "file://usr/share/doc/nvidia-tegra/LICENSE.minigbm;md5=72f855f00b364ec8bdc025e1a36b39c3"
-
-MAINSUM = "26463537a9d0b0438c89cbdabc3242d8e73410f023ed1d11ceb40a18e49b4fd7"
-
-TEGRA_LIBRARIES_TO_INSTALL = "\
-    tegra/libnvgbm.so \
-"
-
-do_install:append() {
-    patchelf --set-soname libnvgbm.so.1 ${D}${libdir}/libnvgbm.so
-}
-
-DEBIAN_NOAUTONAME:${PN} = "1"
-DEBIAN_NOAUTONAME:${PN}-dev = "1"
-DEBIAN_NOAUTONAME:${PN}-dbg = "1"
-FILES_SOLIBSDEV = ""
-SOLIBS = ".so*"
-RRECOMMENDS:${PN} = "kernel-module-nvgpu"

recipes-bsp/tegra-binaries/tegra-libraries-glescore_35.2.1.bb

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

recipes-bsp/tegra-binaries/tegra-libraries-glxcore_35.2.1.bb

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

recipes-bsp/tegra-binaries/tegra-libraries-multimedia-utils_35.2.1.bb

@@ -3,7 +3,7 @@ DEPENDS = "tegra-libraries-core virtual/egl"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "0900d0a630edd7acc35b7d5e7e870234e9b7a8cdb7b00a2d577450de88c06202"
+MAINSUM = "f75be73fdf870d1b33d97ece227114485434ab465f6526135edd19d40418e573"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-multimedia-v4l_35.2.1.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-multimedia"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "9a1628fef3dce3434b67af1235e0bff595b9cedc2c77a9f735037ce94f286c28"
+MAINSUM = "505ca0ca10fd91eae99f0c441beb73b543e796d9c0d013122684a1fa2db7a29e"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-multimedia_35.2.1.bb

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM += "\
     file://usr/share/doc/nvidia-tegra/LICENSE.libnvjpeg;md5=1b873f8976e4e3683c04133e3035be98 \
 "
 
-MAINSUM = "9a1628fef3dce3434b67af1235e0bff595b9cedc2c77a9f735037ce94f286c28"
+MAINSUM = "505ca0ca10fd91eae99f0c441beb73b543e796d9c0d013122684a1fa2db7a29e"
 
 inherit features_check
 
@@ -29,6 +29,14 @@ TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra/libnvmedia_2d.so \
     tegra/libnvmedia_dla.so \
     tegra/libnvmedialdc.so \
+    tegra/libnvmedia_eglstream.so \
+    tegra/libnvmedia_ide_parser.so \
+    tegra/libnvmedia_ide_sci.so \
+    tegra/libnvmedia_iep_sci.so \
+    tegra/libnvmedia_ijpd_sci.so \
+    tegra/libnvmedia_ijpe_sci.so \
+    tegra/libnvmedia_iofa_sci.so \
+    tegra/libnvmedia_sci_overlay.so \
     tegra/libnvmedia_tensor.so \
     tegra/libnvmm.so \
     tegra/libnvmm_contentpipe.so \
@@ -39,6 +47,7 @@ TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra/libnvmmlite_utils.so \
     tegra/libnvmmlite_video.so \
     tegra/libnvofsdk.so \
+    tegra/libnvoggopus.so \
     tegra/libnvosd.so \
     tegra/libnvparser.so \
     tegra/libnvtracebuf.so \

recipes-bsp/tegra-binaries/tegra-libraries-nvdsseimeta_35.2.1.bb

@@ -7,7 +7,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-gstreamer"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "16b2b02bcd3f0a4dce9c0a85976c5e0345e7e5af17a8ecab4fdf40797a5f74a0"
+MAINSUM = "76567c73f13ddf0cc837caa5c143bcf447b5667f28e18a7108df10868476f4b0"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra/libgstnvdsseimeta.so.1.0.0 \

recipes-bsp/tegra-binaries/tegra-libraries-nvsci_35.2.1.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 = "0e4725e46d3cfc03be9cd6f7068c5d5e7fadd7cf1613004ffedc6b79cf32f628"
+MAINSUM = "a70c17876e1c9d83d73409950039d40b1ce16f40ebd2ff26c8110c5463208000"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra/libnvscibuf.so.1 \

recipes-bsp/tegra-binaries/tegra-libraries-omx_35.2.1.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-multimedia"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "9a1628fef3dce3434b67af1235e0bff595b9cedc2c77a9f735037ce94f286c28"
+MAINSUM = "4436047f22806da010a3f23ff2bd66a04fe7f92ea9a8e930b501b26c042b1591"
 
 inherit features_check
 

recipes-bsp/tegra-binaries/tegra-libraries-pva_35.2.1.bb

@@ -3,7 +3,7 @@ DEPENDS = "tegra-libraries-core tegra-libraries-nvsci tegra-libraries-cuda"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "798303253cc483c6afbd98bf395ea1c20df872ea96e06e084c9bb72fde1eb36a"
+MAINSUM = "984d888f70a2c93a17848ef7d77e2cc91c887c4a8e44a03047dcc983b3a5b13e"
 
 TEGRA_LIBRARIES_TO_INSTALL = "\
     tegra/libnvpvaintf.so \

recipes-bsp/tegra-binaries/tegra-libraries-vulkan_35.2.1.bb

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

recipes-bsp/tegra-binaries/tegra-libraries-winsys_35.2.1.bb

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

recipes-bsp/tegra-binaries/tegra-nvfancontrol_35.2.1.bb

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

recipes-bsp/tegra-binaries/tegra-nvphs-base_35.2.1.bb

@@ -8,8 +8,8 @@ require tegra-debian-libraries-common.inc
 
 SRC_SOC_DEBS += "${@l4t_deb_pkgname(d, 'init')};subdir=${BP};name=init"
 
-MAINSUM = "26463537a9d0b0438c89cbdabc3242d8e73410f023ed1d11ceb40a18e49b4fd7"
-INITSUM = "9a7b2a92b8900af7d47a6d1f9e2c3c00e6fe78184c0bd02a8edfa72dcd2fa74b"
+MAINSUM = "1f859d400c4d4bc0a41119bee18074d48d8fa3396a5adf521b0182b08be2d5ab"
+INITSUM = "36b53071e126e9ddf6017e745f47165727ff1c7eb1eedea53a0aec41363dc044"
 SRC_URI[init.sha256sum] = "${INITSUM}"
 
 do_install() {

recipes-bsp/tegra-binaries/tegra-nvpmodel-base_35.2.1.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-nvpmodel"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "e76670df5520d0863ff58687d06c0bec0624dff62da2f0df2584a18db609a1a1"
+MAINSUM = "61524668ef47922322d16ffda6eae5dadcdef7792c422da83fd050130a4e35cb"
 
 # When left unset, l4t default setting will be used
 NVPMODEL_CONFIG_DEFAULT ??= ""

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

@@ -8,11 +8,11 @@ Signed-off-by: Matt Madison <matt@madison.systems>
  etc/systemd/nvpower.sh | 81 +-----------------------------------------
  1 file changed, 1 insertion(+), 80 deletions(-)
 
-Index: tegra-nvpower-35.1.0-20220810203728/etc/systemd/nvpower.sh
+Index: tegra-nvpower-35.2.1-20230121191456/etc/systemd/nvpower.sh
 ===================================================================
---- tegra-nvpower-35.1.0-20220810203728.orig/etc/systemd/nvpower.sh
-+++ tegra-nvpower-35.1.0-20220810203728/etc/systemd/nvpower.sh
-@@ -97,101 +97,6 @@ function set_power_state_perm()
+--- tegra-nvpower-35.2.1-20230121191456.orig/etc/systemd/nvpower.sh
++++ tegra-nvpower-35.2.1-20230121191456/etc/systemd/nvpower.sh
+@@ -109,109 +109,6 @@ function set_power_state_perm()
  	fi
  }
  
@@ -45,10 +45,10 @@ Index: tegra-nvpower-35.1.0-20220810203728/etc/systemd/nvpower.sh
 -				conf_file="/etc/nvpmodel/nvpmodel_p3767_0000.conf"
 -			elif [ "${machine}" = "p3701-0000-as-p3767-0001" ]; then
 -				conf_file="/etc/nvpmodel/nvpmodel_p3767_0001.conf"
--			elif [ "${machine}" = "p3701-0000-as-p3769" ]; then
--				conf_file="/etc/nvpmodel/nvpmodel_p3769.conf"
--			elif [ "${machine}" = "p3701-0000-as-p3770" ]; then
--				conf_file="/etc/nvpmodel/nvpmodel_p3770.conf"
+-			elif [ "${machine}" = "p3701-0000-as-p3767-0003" ]; then
+-				conf_file="/etc/nvpmodel/nvpmodel_p3767_0003.conf"
+-			elif [ "${machine}" = "p3701-0000-as-p3767-0004" ]; then
+-				conf_file="/etc/nvpmodel/nvpmodel_p3767_0004.conf"
 -			elif [ "${machine}" = "p3701-0000-as-pxxxx" ] || \
 -				[ "${machine}" = "e2421-1099-as-pxxxx" ]; then
 -				conf_file="/etc/nvpmodel/nvpmodel_pxxxx.conf"
@@ -60,8 +60,16 @@ Index: tegra-nvpower-35.1.0-20220810203728/etc/systemd/nvpower.sh
 -			elif [ "${machine}" = "p3767-0000" ] || \
 -				[ "${machine}" = "p3767-0002" ]; then
 -				conf_file="/etc/nvpmodel/nvpmodel_p3767_0000.conf"
--			elif [ "${machine}" = "p3767-0001" ]; then
+-			elif [ "${machine}" = "p3767-0000-as-p3767-0001" ] || \
+-				[ "${machine}" = "p3767-0001" ]; then
 -				conf_file="/etc/nvpmodel/nvpmodel_p3767_0001.conf"
+-			elif [ "${machine}" = "p3767-0003" ] || \
+-				[ "${machine}" = "p3767-0005" ] || \
+-				[ "${machine}" = "p3767-0000-as-p3767-0003" ]; then
+-				conf_file="/etc/nvpmodel/nvpmodel_p3767_0003.conf"
+-			elif [ "${machine}" = "p3767-0004" ] || \
+-				[ "${machine}" = "p3767-0000-as-p3767-0004" ]; then
+-				conf_file="/etc/nvpmodel/nvpmodel_p3767_0004.conf"
 -			else
 -				conf_file="/etc/nvpmodel/nvpmodel_p3701_0000.conf"
 -			fi
@@ -95,7 +103,7 @@ Index: tegra-nvpower-35.1.0-20220810203728/etc/systemd/nvpower.sh
 -			if [ "${machine}" = "p3701-0002" ]; then
 -				conf_file="/etc/nvpower/nvfancontrol/nvfancontrol_p3701_0002.conf"
 -			elif [[ "${machine}" =~ "p3767" ]]; then
--				conf_file="/etc/nvpower/nvfancontrol/nvfancontrol_p3767.conf"
+-				conf_file="/etc/nvpower/nvfancontrol/nvfancontrol_p3767_0000.conf"
 -			else
 -				conf_file="/etc/nvpower/nvfancontrol/nvfancontrol_p3701_0000.conf"
 -			fi
@@ -114,7 +122,7 @@ Index: tegra-nvpower-35.1.0-20220810203728/etc/systemd/nvpower.sh
  function cpu_hotplug()
  {
  	# CPU hotplug
-@@ -230,7 +135,7 @@ function set_cpu_governor()
+@@ -250,7 +147,7 @@ function set_cpu_governor()
  			*schedutil*)
  				# latest kernel is using the upstream driver and need to avoid setting
  				# schedutil governor on kstable.
@@ -123,7 +131,7 @@ Index: tegra-nvpower-35.1.0-20220810203728/etc/systemd/nvpower.sh
  					CPU_SCHEDUTIL_GOV=1
  				fi
  	        ;;
-@@ -478,8 +383,6 @@ SOCFAMILY=""
+@@ -498,8 +395,6 @@ SOCFAMILY=""
  
  set_socfamily
  set_power_state_perm

recipes-bsp/tegra-binaries/tegra-nvpower_35.2.1.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 = "26463537a9d0b0438c89cbdabc3242d8e73410f023ed1d11ceb40a18e49b4fd7"
-SRC_URI[init.sha256sum] = "9a7b2a92b8900af7d47a6d1f9e2c3c00e6fe78184c0bd02a8edfa72dcd2fa74b"
-SRC_URI[tools.sha256sum] = "8e4d140cdcd3349e93cc28d87e0e0c61dd091f9535f1e022812ecb0fe5e00bb2"
+MAINSUM = "1f859d400c4d4bc0a41119bee18074d48d8fa3396a5adf521b0182b08be2d5ab"
+SRC_URI[init.sha256sum] = "36b53071e126e9ddf6017e745f47165727ff1c7eb1eedea53a0aec41363dc044"
+SRC_URI[tools.sha256sum] = "342d62df7bba36332fea289584b4153ccf8ad7d5bec17afd5fef0958b31e822f"
 
 SRC_URI += "\
     file://0001-Drop-bc-usage-and-remove-symlink-creation-functions.patch \

recipes-bsp/tegra-binaries/tegra-nvs-base_35.2.1.bb

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

recipes-bsp/tegra-binaries/tegra-nvsciipc-base_35.2.1.bb

@@ -10,8 +10,8 @@ SRC_SOC_DEBS += "\
     ${@l4t_deb_pkgname(d, 'init')};subdir=${BP};name=init \
 "
 
-MAINSUM = "8e4d140cdcd3349e93cc28d87e0e0c61dd091f9535f1e022812ecb0fe5e00bb2"
-INITSUM = "9a7b2a92b8900af7d47a6d1f9e2c3c00e6fe78184c0bd02a8edfa72dcd2fa74b"
+MAINSUM = "342d62df7bba36332fea289584b4153ccf8ad7d5bec17afd5fef0958b31e822f"
+INITSUM = "36b53071e126e9ddf6017e745f47165727ff1c7eb1eedea53a0aec41363dc044"
 SRC_URI[init.sha256sum] = "${INITSUM}"
 
 do_install() {

recipes-bsp/tegra-binaries/tegra-redundant-boot-base_35.2.1.bb

@@ -5,7 +5,7 @@ L4T_DEB_TRANSLATED_BPN = "nvidia-l4t-tools"
 
 require tegra-debian-libraries-common.inc
 
-MAINSUM = "8e4d140cdcd3349e93cc28d87e0e0c61dd091f9535f1e022812ecb0fe5e00bb2"
+MAINSUM = "342d62df7bba36332fea289584b4153ccf8ad7d5bec17afd5fef0958b31e822f"
 
 do_install() {
 	install -d ${D}${sbindir}

recipes-bsp/tegra-binaries/tegra-tools_35.2.1.bb

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

recipes-bsp/tegra-binaries/tegra-uefi-prebuilt_35.2.1.bb

@@ -11,10 +11,12 @@ DEPENDS = "coreutils-native"
 
 DTB_OVERLAYS = "\
    AcpiBoot.dtbo \
+   BootOrderNvme.dtbo \
+   BootOrderPxe.dtbo \
+   BootOrderSata.dtbo \
+   BootOrderUfs.dtbo \
+   BootOrderUsb.dtbo \
    L4TConfiguration.dtbo \
-   L4TRootfsInfo.dtbo \
-   L4TRootfsABInfo.dtbo \
-   L4TRootfsBrokenInfo.dtbo \
 "
 
 inherit deploy

recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia_35.2.1.bb

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

recipes-bsp/tegra-sources/tegra-sources-35.2.1.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] = "1d955ecafe65c69526b79042e7dcd0bdae8ef32e75b6262287094d91796c8f6a"
+SRC_URI[sha256sum] = "ae9d2f903347013a915b128cf311899a24c6ba21e13607cdbde785e1f0557449"
 
 inherit l4t_bsp