Imported l4t-32.7.1 / driver 4.0.0 final code

avt_build/jetson_build/board.py

@@ -3,7 +3,7 @@
 from . import upstream
 from . import build
 
-AVT_RELEASE = "4.0.0~beta1"
+AVT_RELEASE = "4.0.0"
 KERNEL_RELEASE = "4.9.253-tegra"
 L4T_VERSION = "32.7.1"
 
@@ -70,8 +70,8 @@ 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, TX2", "xavier", get_tx2_agx_nx_upstream_files, ['tegra194','tegra186'], ['t19x','t18x'], kernel_extra_files_xavier,bootloader_payload_files_xavier, "32.7.1-20220219090344"),
+  'nano':   ("Nano, Nano 2GB", "nano", "nano", get_nano_upstream_files,       ['tegra210'],             ['t21x'], kernel_extra_files_nano,bootloader_payload_files_nano, "32.7.1-20220219090432"),
+  'xavier': ("AGX, NX, TX2", "xavier", None, get_tx2_agx_nx_upstream_files, ['tegra194','tegra186'], ['t19x','t18x'], kernel_extra_files_xavier,bootloader_payload_files_xavier, "32.7.1-20220219090344"),
 }
 
 
@@ -80,7 +80,7 @@ def boards(args):
   build_dir = build.build_dir(args)
 
   def mk_board(brd):
-    return Board(brd[0], brd[1], build_dir(brd[1]), brd[2](UpstreamFile), brd[3], brd[4], brd[5], brd[6],brd[7])
+    return Board(brd[0], brd[2], build_dir(brd[1]), brd[3](UpstreamFile), brd[4], brd[5], brd[6], brd[7],brd[8])
 
   UpstreamFile = upstream.upstream(args)
   return [mk_board(known_boards[board]) for board in args.boards]

avt_build/jetson_build/deploy.py

@@ -210,7 +210,11 @@ def build_tar_bundle(args, board):
   base_dir = Path(__file__).parent
   p = board.build_dir / "Linux_for_Tegra/kernel/avt/"
   template_args = t.get_template_args(board)
-  bundle_name = string.Template("AlliedVision_NVidia_${BOARD_NAME}_L4T_${L4T_VERSION}_${AVT_RELEASE}").substitute(template_args)
+  if board.bundle_name is None:
+    bundle_name = string.Template("AlliedVision_NVidia_L4T_${L4T_VERSION}_${AVT_RELEASE}").substitute(template_args)
+  else:
+    bundle_name = string.Template("AlliedVision_NVidia_${BOARD_NAME}_L4T_${L4T_VERSION}_${AVT_RELEASE}").substitute(template_args)
+
 
   bundle_file = p / f'{bundle_name}.tar.gz'
 

avt_build/jetson_build/files/bootloader/config

@@ -50,31 +50,33 @@ class NvSpecInformation:
 
 
 class Configuration:
-    def __init__(self, name, dtb, board_sku, board_ver=None):
+    def __init__(self, name, dtb, board_sku, board_ver=None, beta=False):
         self.name = name
+        self.beta = beta
         self.dtb = dtb
         self.board_sku = board_sku
         self.board_ver = board_ver
 
 
 tx2_devkit = BoardDefinition('Jetson TX2 devkit', '0x18', '3310', [
     Configuration('2 cameras', 'tegra186-quill-p3310-1000-a00-00-avt-14375-2cam.dtb', '1000'),
-    Configuration('3 cameras', 'tegra186-quill-p3310-1000-a00-00-avt-14385-3cam.dtb', '1000'),
-    Configuration('6 cameras with 2 addresses', 'tegra186-quill-p3310-1000-a00-00-avt-14385-6cam2addr.dtb', '1000'),
-    Configuration('6 cameras with 6 addresses', 'tegra186-quill-p3310-1000-a00-00-avt-14385-6cam6addr.dtb', '1000'),
+    Configuration('3 cameras (beta)', 'tegra186-quill-p3310-1000-a00-00-avt-14385-3cam.dtb', '1000', beta=True),
+    Configuration('6 cameras with 2 addresses (beta)', 'tegra186-quill-p3310-1000-a00-00-avt-14385-6cam2addr.dtb', '1000', beta=True),
+    Configuration('6 cameras with 6 addresses (beta)', 'tegra186-quill-p3310-1000-a00-00-avt-14385-6cam6addr.dtb', '1000', beta=True),
     Configuration('None', 'tegra186-quill-p3310-1000-c03-00-base.dtb', '1000'),
 ])
 
 tx2_nx_devkit = BoardDefinition('Jetson TX2 NX devkit', '0x18', '3636', [
     Configuration('DevKit', 'tegra186-p3636-0001-p3509-0000-a01.dtb', '0001'),
+    Configuration('Auvidea JNX30D (beta)', 'tegra186-p3636-0001-auvidea-jnx30d-avt.dtb', '0001', beta=True),
 ])
 
 agx_devkit = BoardDefinition('Jetson AGX Xavier devkit', '0x19', '2888', [
     Configuration('2 cameras', 'tegra194-p2888-0001-p2822-0000-avt-14375-2cam.dtb', '0001'),
     Configuration('2 cameras', 'tegra194-p2888-0001-p2822-0000-avt-14375-2cam.dtb', '0004'),
 
-    Configuration('6 cameras', 'tegra194-p2888-0001-p2822-0000-avt-14385-6cam.dtb', '0001'),
-    Configuration('6 cameras', 'tegra194-p2888-0001-p2822-0000-avt-14385-6cam.dtb', '0004'),
+    Configuration('6 cameras (beta)', 'tegra194-p2888-0001-p2822-0000-avt-14385-6cam.dtb', '0001', beta=True),
+    Configuration('6 cameras (beta)', 'tegra194-p2888-0001-p2822-0000-avt-14385-6cam.dtb', '0004', beta=True),
 
     Configuration('None', 'tegra194-p2888-0001-p2822-0000.dtb', '0001'),
     Configuration('None', 'tegra194-p2888-0001-p2822-0000.dtb', '0004'),
@@ -83,15 +85,23 @@ agx_devkit = BoardDefinition('Jetson AGX Xavier devkit', '0x19', '2888', [
 nx_devkit = BoardDefinition('Jetson Xavier NX devkit', '0x19', '3668', [
     Configuration('DevKit', 'tegra194-p3668-all-p3509-0000-avt.dtb', '0000'),
     Configuration('DevKit', 'tegra194-p3668-all-p3509-0000-avt.dtb', '0001'),
+    #NX 16GB
+    Configuration('DevKit', 'tegra194-p3668-all-p3509-0000-avt.dtb', '0003'),
 
-    Configuration('Auvidea JNX30', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0000'),
-    Configuration('Auvidea JNX30', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0001'),
+    Configuration('Auvidea JNX30 (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0000', beta=True),
+    Configuration('Auvidea JNX30 (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0001', beta=True),
+    #NX 16GB
+    Configuration('Auvidea JNX30 (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0003', beta=True),
 
-    Configuration('Auvidea JNX30+38491 FPD-Link', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0000'),
-    Configuration('Auvidea JNX30+38491 FPD-Link', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0001'),
+    Configuration('Auvidea JNX30+38491 FPD-Link (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0000', beta=True),
+    Configuration('Auvidea JNX30+38491 FPD-Link (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0001', beta=True),
+    #NX 16GB
+    Configuration('Auvidea JNX30+38491 FPD-Link (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0003', beta=True),
 
     Configuration('None', 'tegra194-p3668-all-p3509-0000.dtb', '0000'),
     Configuration('None', 'tegra194-p3668-all-p3509-0000.dtb', '0001'),
+    #NX 16GB
+    Configuration('None', 'tegra194-p3668-all-p3509-0000.dtb', '0003'),
 ])
 
 nano_devkit = BoardDefinition('Jetson Nano', '0x21', '3448', [
@@ -285,6 +295,10 @@ def main():
     new_option = db.getString('avt-nvidia-l4t-bootloader/target-board')
     for i in range(len(config_list)):
         if config_list[i] == new_option:
+            if active_board.configurations()[i].beta:
+                db.forceInput(debconf.HIGH, 'avt-nvidia-l4t-bootloader/beta-warning')
+                db.command('GO')
+
             active_board.update_active_configuration(i)
             break
 

avt_build/jetson_build/files/bootloader/control

@@ -4,8 +4,8 @@ Maintainer: Allied Vision Technologies GmbH
 Package: avt-nvidia-l4t-bootloader
 Architecture: arm64
 Pre-Depends: nvidia-l4t-core (>> 32.7-0), nvidia-l4t-core (<< 32.8-0)
-Depends: nvidia-l4t-tools (= ${L4T_TOOLS_VERSION}), nvidia-l4t-init (>> 32.7-0), nvidia-l4t-init (<< 32.8-0)
-Conflicts: nvidia-l4t-bootloader
+Depends: nvidia-l4t-tools (>> 32.7-0), nvidia-l4t-tools (<< 32.8-0), nvidia-l4t-init (>> 32.7-0), nvidia-l4t-init (<< 32.8-0)
+Conflicts: nvidia-l4t-bootloader (<< 32.8-0)
 Section: bootloader
 Priority: standard
 Homepage: http://developer.nvidia.com/jetson

avt_build/jetson_build/files/bootloader/templates

@@ -3,3 +3,8 @@ Type: select
 Choices: ${board-configurations}
 Default: ${default-board-configuration}
 Description: Select board configuration:
+
+Template: avt-nvidia-l4t-bootloader/beta-warning
+Type: note
+Description: WARNING: beta configuration selected!
+ The selected configuration is in beta state and not validated.

avt_build/jetson_build/files/kernel-deb/control

@@ -5,7 +5,7 @@ Package: avt-nvidia-l4t-kernel
 Architecture: arm64
 Pre-Depends: nvidia-l4t-core (>> 32.7-0), nvidia-l4t-core (<< 32.8-0)
 Depends: nvidia-l4t-tools (>> 32.7-0), nvidia-l4t-tools (<< 32.8-0)
-Conflicts: nvidia-l4t-kernel
+Conflicts: nvidia-l4t-kernel (<< 32.8-0)
 Section: kernel
 Priority: standard
 Homepage: http://developer.nvidia.com/jetson

avt_build/jetson_build/files/kernel-dtb-deb/control

@@ -5,7 +5,7 @@ Package: avt-nvidia-l4t-kernel-dtbs
 Architecture: arm64
 Pre-Depends: nvidia-l4t-core (>> 32.7-0), nvidia-l4t-core (<< 32.8-0)
 Depends: device-tree-compiler, avt-nvidia-l4t-kernel (= ${KERNEL_RELEASE}-${L4T_VERSION}-${AVT_RELEASE})
-Conflicts: nvidia-l4t-kernel-dtbs
+Conflicts: nvidia-l4t-kernel-dtbs (<< 32.8-0)
 Section: kernel
 Priority: standard
 Homepage: http://developer.nvidia.com/jetson

avt_build/jetson_build/files/kernel-headers-deb/control

@@ -5,7 +5,7 @@ Package: avt-nvidia-l4t-kernel-headers
 Architecture: arm64
 Pre-Depends: nvidia-l4t-core (>> 32.7-0), nvidia-l4t-core (<< 32.8-0)
 Depends: libc6,  avt-nvidia-l4t-kernel (= ${KERNEL_RELEASE}-${L4T_VERSION}-${AVT_RELEASE})
-Conflicts: nvidia-l4t-kernel-headers
+Conflicts: nvidia-l4t-kernel-headers (<< 32.8-0)
 Section: kernel
 Priority: standard
 Homepage: http://developer.nvidia.com/jetson

avt_build/jetson_build/tools.py

@@ -17,13 +17,13 @@ def get_template_args(board):
     if avt_release is None:
       process = subprocess.run(['git','rev-parse','--short','HEAD'],stdout=subprocess.PIPE)
       git_hash = process.stdout.decode("utf-8").strip()
-      avt_release = f'dev-{git_hash}'
+      avt_release = f'{AVT_RELEASE}~g{git_hash}'
 
     template_args = {
       "L4T_TOOLS_VERSION": board.l4t_tools_version,
       "KERNEL_RELEASE": KERNEL_RELEASE,
       "L4T_VERSION": L4T_VERSION,
-      "AVT_RELEASE": AVT_RELEASE,
+      "AVT_RELEASE": avt_release,
       "BOARD_NAME": board.bundle_name
     }
     return template_args

hardware/nvidia/platform/t18x/lanai/kernel-dts/Makefile

@@ -7,6 +7,7 @@ makefile-path := platform/t18x/lanai/kernel-dts
 dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-p3509-0000-a01.dtb
 dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0002-p3509-0000-a01.dtb
 dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0002-lanai.dtb
+dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-auvidea-jnx30d-avt.dtb
 dtbo-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-p3509-0000-a01-adafruit-sph0645lm4h.dtbo
 dtbo-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-p3509-0000-a01-adafruit-uda1334a.dtbo
 dtbo-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-p3509-0000-a01-fe-pi-audio.dtbo