Imported 35.6.0-5.1.4 source

Author: dlangenkamp-avt

README.md

@@ -1,7 +1,7 @@
 # NVIDIA Jetson driver (Beta)
 
 
-Driver (Beta) for Allied Vision Alvium MIPI cameras for NVIDIA Jetson with JetPack 5.1.3 (L4T 35.5.0)     
+Driver (Beta) for Allied Vision Alvium MIPI cameras for NVIDIA Jetson with JetPack 5.1.4 (L4T 35.6.0)     
 https://developer.nvidia.com/embedded/jetpack
 ![Alvium camera](https://cdn.alliedvision.com/fileadmin/content/images/cameras/Alvium/various/alvium-cameras-models.png)
 
@@ -13,14 +13,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 The scripts in this project build and install the Allied Vision MIPI camera driver to the NVIDIA Jetson boards.
 
-Compatible platforms with JetPack 5.1.3 (L4T 35.5.0) : 
+Compatible platforms with JetPack 5.1.4 (L4T 35.6.0) : 
 
   - AGX Orin Developer Kit
   - AGX Xavier DevKit
   - Xavier NX DevKit
   - Auvidea carrier JNX30-PD with Xavier NX
-  - Orin Nano Developer Kit (**NEW**)
-  - Orin NX on the Orin Nano Developer Kit Carrier Board (**NEW**)
+  - Orin Nano Developer Kit
+  - Orin NX on the Orin Nano Developer Kit Carrier Board
 
 ***Before starting the installation, make sure to create a backup of your Jetson system.***
 
@@ -29,9 +29,9 @@ Compatible platforms with JetPack 5.1.3 (L4T 35.5.0) :
 ### Host PC
 The scripts for the driver installation require Git on the host PC.
 
-### Install JetPack 5.1.3
+### Install JetPack 5.1.4
 
-Install JetPack 5.1.3 (L4T 35.5.0) as per NVIDIA's instructions
+Install JetPack 5.1.4 (L4T 35.6.0) as per NVIDIA's instructions
  https://developer.nvidia.com/embedded/jetpack      
 
 Recommendation: Use NVIDIA SDK Manager to install JetPack and useful tools such as CUDA.   
@@ -47,7 +47,7 @@ https://docs.nvidia.com/sdk-manager/
   Install the precompiled kernel, which includes the driver and an installation menu.   
 
   1. Extract the tarball on a host PC.   
-  The tarball contains helper scripts and another tarball with the precompiled binaries named AlliedVision_NVidia_L4T_35.5.0.0_<git-rev>.tar.gz. 
+  The tarball contains helper scripts and another tarball with the precompiled binaries named AlliedVision_NVidia_L4T_35.6.0.0_<git-rev>.tar.gz. 
 
 2. Copy the tarball to the target board. 
 3. On the target board, extract the tarball and run the included install script.   
@@ -79,7 +79,7 @@ Reboot the board. Now you can use the driver.
 
 To change the configuration after the driver was installed, enter:
 
-`dpkg-reconfigure avt-nvidia-l4t-bootloader`
+`sudo dpkg-reconfigure avt-nvidia-l4t-kernel-dtbs`
 
 Reboot the board to apply the changes.
 

avt_build/jetson_build/board.py

@@ -3,9 +3,9 @@
 from . import upstream
 from . import build
 
-AVT_RELEASE = "5.1.3"
-KERNEL_RELEASE = "5.10.192-tegra"
-L4T_VERSION = "35.5.0"
+AVT_RELEASE = "5.1.4"
+KERNEL_RELEASE = "5.10.216-tegra"
+L4T_VERSION = "35.6.0"
 
 FileSet = namedtuple('FileSet', [
   'driver_package',
@@ -14,9 +14,9 @@
 
 
 def get_tx2_agx_nx_upstream_files(UpstreamFile):
-  driver_package  = UpstreamFile("https://developer.download.nvidia.com/embedded/L4T/r35_Release_v5.0/release/Jetson_Linux_R35.5.0_aarch64.tbz2",                     "8cde3bd937d3eedb640a1c58d108c109f7cb904c38a03101dc17904b7d185ddf")
+  driver_package  = UpstreamFile("https://developer.download.nvidia.com/embedded/L4T/r35_Release_v6.0/release/Jetson_Linux_R35.6.0_aarch64.tbz2",                     "1cc07ea946df064b1eb5d6ba8bc289d84e6b9f437b5f538e95a0d2ae6639e601")
   #rootfs          = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.1/t186/tegra_linux_sample-root-filesystem_r32.7.1_aarch64.tbz2", "17996e861dd092043509e0b7e9ae038e271e5b0b7b78f26a34db4f03df2b12b8")
-  public_sources  = UpstreamFile("https://developer.download.nvidia.com/embedded/L4T/r35_Release_v5.0/sources/public_sources.tbz2",                             "89368d7003c278cdcf3746501db0ba5aa01f8cf9b39f2205d2d16c7852ab523e")
+  public_sources  = UpstreamFile("https://developer.download.nvidia.com/embedded/L4T/r35_Release_v6.0/sources/public_sources.tbz2",                             "0b1d3077c3ca3487ae5b9cd66da9a611e1fb30097123265d9453d9975aee8b89")
 
   return FileSet(
     public_sources=public_sources,
@@ -32,30 +32,7 @@ def get_tx2_agx_nx_upstream_files(UpstreamFile):
 #    public_sources=public_sources,
     #rootfs=rootfs,
 #    driver_package=driver_package)
-  
-bootloader_payload_files_xavier = [
-  ("bootloader/payloads_t19x/bl_only_payload", "opt/ota_package/t19x/bl_only_payload"),
-  ("bootloader/payloads_t19x/TEGRA_BL.Cap", "opt/ota_package/t19x/TEGRA_BL.Cap"),
-  ("bootloader/BOOTAA64.efi", "opt/ota_package/t19x/BOOTAA64.efi"),
-  ("bootloader/payloads_t23x/bl_only_payload", "opt/ota_package/t23x/bl_only_payload"),
-  ("bootloader/payloads_t23x/TEGRA_BL.Cap", "opt/ota_package/t23x/TEGRA_BL.Cap"),
-  ("bootloader/BOOTAA64.efi", "opt/ota_package/t23x/BOOTAA64.efi")
-]
-
-bootloader_payload_files_tx2 = [
-  ("bootloader/payloads_t18x/bl_update_payload", "opt/ota_package/t18x/bl_update_payload"),
-  ("bootloader/payloads_t19x/bl_update_payload", "opt/ota_package/t19x/bl_update_payload")
-]
-
-kernel_extra_files_xavier = [
-  ("bootloader/payloads_t19x/kernel_only_payload", "opt/ota_package/t19x/kernel_only_payload"),
-  ("bootloader/payloads_t23x/kernel_only_payload", "opt/ota_package/t23x/kernel_only_payload")
-]
-
-kernel_extra_files_nano = []
-bootloader_payload_files_nano = [
-  ("bootloader/payloads_t21x/bl_update_payload", "opt/ota_package/t21x/bl_update_payload")
-]
+ 
 
 
 class Board:
@@ -73,7 +50,7 @@ def __init__(self, name, bundle_name, build_dir, files, dtb_filters, bups, kerne
 
 known_boards = {
   #'nano':   ("Nano, Nano 2GB", "nano", get_nano_upstream_files,       ['tegra210'],             ['t21x'], kernel_extra_files_nano,bootloader_payload_files_nano, "32.7.1-20220219090432"),
-  'xavier': ("AGX, NX", "xavier", None, get_tx2_agx_nx_upstream_files, ['tegra194','tegra234'], ['t19x','t23x'], kernel_extra_files_xavier,bootloader_payload_files_xavier, "34.1.0-20220406120854"),
+  'xavier': ("AGX, NX", "xavier", None, get_tx2_agx_nx_upstream_files, ['tegra194','tegra234'], [], [], [], "34.1.0-20220406120854"),
 }
 
 

avt_build/jetson_build/build.py

@@ -30,6 +30,7 @@ def __call__(self, parser, namespace, values, option_string=None):
   parser.add_argument('--debug', '-d', default=False, action='store_true', help="Enable debug output (includes verbose output)")
   parser.add_argument('--install-missing',  default=False, action='store_true', help="Install missing host packages")
   parser.add_argument('--sign','-s',default=None,type=str, help="Sign debian repository with given key")
+  parser.add_argument('--l4t-version', default=False, action='store_true', help='Show current jetson linux version and exit')
 
 def build_dir(args):
   b_dir = args.build_dir
@@ -88,6 +89,10 @@ def verbose(msg, *args, **kwargs):
 
     args = parser.parse_args()
 
+    if args.l4t_version:
+      print(board.L4T_VERSION)
+      exit()
+
     logging.basicConfig(level=logging.DEBUG, filename=args.logfile, filemode='w')
     console = logging.StreamHandler()
 

avt_build/jetson_build/deploy.py

@@ -27,22 +27,22 @@ def build_kernel_deb(args, board):
   file.close()
 
   install_modules(args, board)
-  t.execute(['sudo', 'rm', '-rf', board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out/lib/firmware"])
-  t.execute(['sudo', 'rm', '-rf', board.build_dir / f"Linux_for_Tegra/kernel/avt/kernel/debian/out/lib/modules/{kernel_release}/build"])
-  t.execute(['sudo', 'rm', '-rf', board.build_dir / f"Linux_for_Tegra/kernel/avt/kernel/debian/out/lib/modules/{kernel_release}/source"])
+  t.execute(['rm', '-rf', board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out/lib/firmware"])
+  t.execute(['rm', '-rf', board.build_dir / f"Linux_for_Tegra/kernel/avt/kernel/debian/out/lib/modules/{kernel_release}/build"])
+  t.execute(['rm', '-rf', board.build_dir / f"Linux_for_Tegra/kernel/avt/kernel/debian/out/lib/modules/{kernel_release}/source"])
 
   shutil.copy(common.common_dir(args) / "kernel/arch/arm64/boot/Image", board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out/boot/Image")
 
-  if 't19x' in board.bups:
+  if 'tegra194' in board.dtb_filters:
     logging.info("Signing kernel image for t19x")
     shutil.copy(board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out/boot/Image", board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out/boot/Image.t19x")
-    t.execute(['sudo',board.build_dir / f"Linux_for_Tegra/l4t_sign_image.sh",'--file','Image.t19x','--chip','0x19','--type','kernel'],cwd=board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out/boot/")
+    t.execute([board.build_dir / f"Linux_for_Tegra/l4t_sign_image.sh",'--file','Image.t19x','--chip','0x19','--type','kernel'],cwd=board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out/boot/")
 
-  if 't23x' in board.bups:
+  if 'tegra234' in board.dtb_filters:
     logging.info("Adding display drivers")
     os.makedirs(board.build_dir / "Linux_for_Tegra/kernel/origin/display", exist_ok=True)
     t.execute(["tar","xf",board.build_dir / "Linux_for_Tegra/kernel/kernel_display_supplements.tbz2","-C",board.build_dir / "Linux_for_Tegra/kernel/origin/display"])
-    t.execute(['sudo', 'cp', '-a', board.build_dir / f"Linux_for_Tegra/kernel/origin/display/lib/modules/{KERNEL_RELEASE}/extra", board.build_dir / f"Linux_for_Tegra/kernel/avt/kernel/debian/out/lib/modules/{kernel_release}/extra"])
+    t.execute(['cp', '-a', board.build_dir / f"Linux_for_Tegra/kernel/origin/display/lib/modules/{KERNEL_RELEASE}/extra", board.build_dir / f"Linux_for_Tegra/kernel/avt/kernel/debian/out/lib/modules/{kernel_release}/extra"])
 
 
   for ef in board.kernel_extra_files:
@@ -101,7 +101,7 @@ def build_dtb_deb(args, board):
   sign_device_trees(args, board, "Linux_for_Tegra/kernel/avt/kernel-dtbs/debian/out/boot")
 
   base_dir = Path(__file__).parent
-  for f in ['rules', 'install', 'compat', 'source/format']:
+  for f in ['rules', 'install', 'compat', 'source/format', 'postinst', 'postrm', 'config', 'templates']:
     dstfile = board.build_dir / "Linux_for_Tegra/kernel/avt/kernel-dtbs/debian" / f
     os.makedirs(dstfile.parent, exist_ok=True)
     shutil.copy(base_dir / "files/kernel-dtb-deb" / f, dstfile)
@@ -110,41 +110,11 @@ def build_dtb_deb(args, board):
     dstfile = board.build_dir / "Linux_for_Tegra/kernel/avt/kernel-dtbs/debian" / f
     os.makedirs(dstfile.parent, exist_ok=True)
     t.apply_template(base_dir / "files/kernel-dtb-deb" / f, dstfile, board)
-
-  for f in ['postinst', 'postrm']:
-    shutil.copy(board.build_dir / "Linux_for_Tegra/kernel/origin/kernel-dtbs/debian" / f, board.build_dir / "Linux_for_Tegra/kernel/avt/kernel-dtbs/debian")
 
   logging.info("Building actual Debian package")
   env = { **os.environ, 'CC': 'aarch64-linux-gnu-gcc' }
   t.execute(['dpkg-buildpackage', '-uc', '-b', '-d', '-a', 'arm64'], cwd=board.build_dir / "Linux_for_Tegra/kernel/avt/kernel-dtbs", env=env)
 
-def build_bootloader_deb(args, board):
-  t = tools.tools(args)
-  logging.info("Building AVT Bootloader Package")
-  for subdir in ['out/usr/share/doc'] + [f"out/{PurePath(e[1]).parent}" for e in board.bootloader_payload_files]:
-    os.makedirs(board.build_dir / f"Linux_for_Tegra/kernel/avt/bootloader/debian/{subdir}", exist_ok=True)
-
-
-  base_dir = Path(__file__).parent
-  for f in ['rules', 'install', 'compat', 'source/format', 'postinst', 'postrm', 'config', 'templates']:
-    dstfile = board.build_dir / "Linux_for_Tegra/kernel/avt/bootloader/debian" / f
-    os.makedirs(dstfile.parent, exist_ok=True)
-    shutil.copy(base_dir / "files/bootloader" / f, dstfile)
-
-  for ef in board.bootloader_payload_files:
-    shutil.copy(board.build_dir / f"Linux_for_Tegra/{ef[0]}", board.build_dir / f"Linux_for_Tegra/kernel/avt/bootloader/debian/out/{ef[1]}")
-
-  for f in ['control', 'changelog']:
-    dstfile = board.build_dir / "Linux_for_Tegra/kernel/avt/bootloader/debian" / f
-    os.makedirs(dstfile.parent, exist_ok=True)
-    t.apply_template(base_dir / "files/bootloader" / f, dstfile, board)
-
-
-  logging.info("Building actual Debian package")
-  env = { **os.environ, 'CC': 'aarch64-linux-gnu-gcc' }
-
-  t.execute(['dpkg-buildpackage', '-uc', '-b', '-d', '-a', 'arm64'], cwd=board.build_dir / "Linux_for_Tegra/kernel/avt/bootloader", env=env)
-
 def build_headers_deb(args, board):
   t = tools.tools(args)
   logging.info("Building AVT Header Package")
@@ -265,8 +235,8 @@ def build_bups(args, board):
   t = tools.tools(args)
   for bup in board.bups:
     logging.info(f"BUP for {bup}")
-    t.execute(['sudo', './l4t_generate_soc_bup.sh', bup], cwd=board.build_dir / "Linux_for_Tegra")
-    t.execute(['sudo', board.build_dir / 'Linux_for_Tegra/generate_capsule/l4t_generate_soc_capsule.sh',
+    t.execute(['./l4t_generate_soc_bup.sh', bup], cwd=board.build_dir / "Linux_for_Tegra")
+    t.execute([board.build_dir / 'Linux_for_Tegra/generate_capsule/l4t_generate_soc_capsule.sh',
                '-i','bl_only_payload','-o','TEGRA_BL.Cap',soc_from_bup(bup)]
               , cwd=board.build_dir / f"Linux_for_Tegra/bootloader/payloads_{bup}")
 
@@ -277,7 +247,7 @@ def install_modules(args, board):
   t = tools.tools(args)
   env = { **os.environ, 'ARCH': 'arm64', 'CROSS_COMPILE': common.common_dir(args) / 'gcc/bin/aarch64-linux-gnu-', 'LANG': 'C' }
   kernel_build_dir=common.common_dir(args) / "kernel"
-  t.execute(['sudo', 'make', f'O={kernel_build_dir}', f'INSTALL_MOD_PATH={board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out"}', 'modules_install'], cwd=build.kernel_source_dir(args), env=env)
+  t.execute(['make', f'O={kernel_build_dir}', f'INSTALL_MOD_PATH={board.build_dir / "Linux_for_Tegra/kernel/avt/kernel/debian/out"}', 'modules_install'], cwd=build.kernel_source_dir(args), env=env)
 
 
 def get_dtb_names(args, board):
@@ -287,18 +257,18 @@ def get_dtb_names(args, board):
 def copy_device_trees(args, board, subdir):
   logging.info(f"Copying device tree blobs");
   t = tools.tools(args)
-  t.execute(["sudo", "cp"] + get_dtb_names(args, board) + [board.build_dir / subdir])
+  t.execute(["cp"] + get_dtb_names(args, board) + [board.build_dir / subdir])
 
 def sign_device_trees(args,board,subdir):
   t = tools.tools(args)
   p = board.build_dir / subdir
   for f in p.glob('tegra194*.dtb'):
-    t.execute(["sudo",board.build_dir / f"Linux_for_Tegra/l4t_sign_image.sh",'--file',f.name,'--chip','0x19','--type','kernel_dtb'],cwd=p)
+    t.execute([board.build_dir / f"Linux_for_Tegra/l4t_sign_image.sh",'--file',f.name,'--chip','0x19','--type','kernel_dtb'],cwd=p)
 
 def copy_kernel_image(args, board):
   t = tools.tools(args)
   logging.info(f"Copying kernel image");
-  t.execute(["sudo", "cp", common.common_dir(args) / "kernel/arch/arm64/boot/Image", board.build_dir / "Linux_for_Tegra/kernel"])
+  t.execute(["cp", common.common_dir(args) / "kernel/arch/arm64/boot/Image", board.build_dir / "Linux_for_Tegra/kernel"])
 
 
 def copy_files_to_l4t(args, board):
@@ -309,7 +279,7 @@ def clean_deploy_directory(args,board):
   if os.path.exists(board.build_dir / "Linux_for_Tegra/kernel/avt"):
     t = tools.tools(args)
     logging.info("Cleaning debain package build directory")
-    t.execute(['sudo', 'rm', '-rf', board.build_dir / "Linux_for_Tegra/kernel/avt"])
+    t.execute(['rm', '-rf', board.build_dir / "Linux_for_Tegra/kernel/avt"])
 
 
 def deploy(args, board):
@@ -320,7 +290,6 @@ def deploy(args, board):
   extract_debs(args, board)
   build_kernel_deb(args, board)
   build_dtb_deb(args, board)
-  build_bootloader_deb(args,board)
   build_headers_deb(args,board)
   build_repository(args, board)
   sign_repository(args,board)