Imported current 4.6.2 beta driver sources

Author: dlangenkamp-avt

README.md

@@ -1,30 +1,42 @@
-# NVIDIA Jetson driver
+# NVIDIA Jetson driver (Beta)
 
-Driver for Allied Vision Alvium MIPI cameras for NVIDIA Jetson with JetPack 4.6.1 (L4T 32.7.1)     
+
+Driver (Beta) for Allied Vision Alvium MIPI cameras for NVIDIA Jetson with JetPack 4.6.2 (L4T 32.7.2)     
 https://developer.nvidia.com/embedded/jetpack
 ![Alvium camera](https://cdn.alliedvision.com/fileadmin/content/images/cameras/Alvium/various/alvium-cameras-models.png)
 
+THE SOFTWARE IS PRELIMINARY AND STILL IN TESTING AND VERIFICATION PHASE AND IS PROVIDED ON 
+AN “AS IS” AND “AS AVAILABLE” BASIS AND IS BELIEVED TO CONTAIN DEFECTS. A PRIMARY PURPOSE 
+OF THIS EARLY ACCESS IS TO OBTAIN FEEDBACK ON PERFORMANCE AND THE IDENTIFICATION OF 
+DEFECT SOFTWARE, HARDWARE AND DOCUMENTATION.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING 
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 ## Overview
 
 The scripts in this project build and install the Allied Vision MIPI camera driver to the NVIDIA Jetson boards.
 
-Compatible platforms with JetPack 4.6.1 (L4T 32.7.1): 
+Compatible platforms with JetPack 4.6.2 (L4T 32.7.2) : 
 
 + Nano 2GB and 4GB NVIDIA developer kit
-+ TX2 (Beta: including optional use of Allied Vision's adapter for up to 6 cameras) 
++ TX2 (including optional use of Allied Vision's adapter for up to 6 cameras) 
 + TX2 NX NVIDIA developer kit
-+ AGX Xavier NVIDIA developer kit (Beta: including optional use of Allied Vision's adapter for up to 6 cameras) 
++ AGX Xavier NVIDIA developer kit (including optional use of Allied Vision's adapter for up to 6 cameras) 
 + Xavier NX NVIDIA developer kit
-+ Beta: Xavier NX on [Auvidea JNX30-PD](https://auvidea.eu/product/38401/) for Alvium cameras with FPD Link interface.
++ Xavier NX on [Auvidea JNX30-PD](https://auvidea.eu/product/38401/) for Alvium cameras with FPD Link interface.
 
 
 The scripts require Git on the host PC.
 
 ***Before starting the installation, make sure to create a backup of your Jetson system.***
 
-## Prerequisites: Install JetPack 4.6.1
+## Prerequisites: Install JetPack 4.6.2
 
-Install JetPack 4.6.1 (L4T 32.7.1) as per NVIDIA's instructions
+Install JetPack 4.6.2 (L4T 32.7.2) 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.   
@@ -33,12 +45,15 @@ https://docs.nvidia.com/sdk-manager/
 
 ## Install Alvium MIPI driver
 
+Because the bootloader cboot has a bug in jetpack 4.6.2, the installation installs a patched cboot version.  
+The applied patch and more information about the bug can be found here: https://forums.developer.nvidia.com/t/cboot-in-32-7-2-fails-to-read-extlinux-conf/214017/15
+
 ### Method A: Use precompiled binaries   
 
-  Install the precompiled kernel, which includes the driver and an installation menu.   
+  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_32.7.1_<git-rev>.tar.gz. 
+  The tarball contains helper scripts and another tarball with the precompiled binaries named AlliedVision_NVidia_L4T_32.7.2_<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.   

avt_build/jetson_build/board.py

@@ -3,9 +3,9 @@
 from . import upstream
 from . import build
 
-AVT_RELEASE = "4.0.0"
+AVT_RELEASE = "4.6.2~beta1"
 KERNEL_RELEASE = "4.9.253-tegra"
-L4T_VERSION = "32.7.1"
+L4T_VERSION = "32.7.2"
 
 FileSet = namedtuple('FileSet', [
   'driver_package',
@@ -14,19 +14,19 @@
 
 
 def get_tx2_agx_nx_upstream_files(UpstreamFile):
-  driver_package  = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.1/t186/jetson_linux_r32.7.1_aarch64.tbz2",                     "368c85a7ef0ab3a3e845cb535ecc1fea71e576a172788906f7178356ad9c9b84")
+  driver_package  = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.2/t186/jetson_linux_r32.7.2_aarch64.tbz2",                     "2b98fa531414ed5bff38de0d4a8b10d272008a84c227bbf16a9082ce924afa70")
   #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.nvidia.com/embedded/l4t/r32_release_v7.1/sources/t186/public_sources.tbz2",                             "3f551de576e0eb0397a8679aed760e53433fbd9c90b1d008caae364f3b7569f9")
+  public_sources  = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.2/sources/t186/public_sources.tbz2",                             "5ff4a46c6b85926450c456b0ee2d78f1801aab9c51b3f51b777c7c27ddf517fd")
 
   return FileSet(
     public_sources=public_sources,
     #rootfs=rootfs,
     driver_package=driver_package)
 
 def get_nano_upstream_files(UpstreamFile):
-  driver_package = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.1/t210/jetson-210_linux_r32.7.1_aarch64.tbz2",                   "7b6f4a698278226ae1d92661270c5441e16d01eafffb4bfb086de80b6964ae6f")
+  driver_package = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.2/t210/jetson-210_linux_r32.7.2_aarch64.tbz2",                   "3165351568f2b6677aceeb7c789bf986d8feb95fdec63eb3989f1c715b1fa795")
   #rootfs         = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.1/t210/tegra_linux_sample-root-filesystem_r32.7.1_aarch64.tbz2", "17996e861dd092043509e0b7e9ae038e271e5b0b7b78f26a34db4f03df2b12b8")
-  public_sources = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.1/sources/t210/public_sources.tbz2",                             "fdf5fb80fca25d107bb1545f9f8985237404b621d751b1c1ddc9a25c1b25cd21")
+  public_sources = UpstreamFile("https://developer.nvidia.com/embedded/l4t/r32_release_v7.2/sources/t210/public_sources.tbz2",                             "4aaccdc4f51c969120ac9bcefe47522d519c7b00fe70a7c2d84bc95c77e56858")
 
   return FileSet(
     public_sources=public_sources,
@@ -55,9 +55,12 @@ def get_nano_upstream_files(UpstreamFile):
   ("bootloader/payloads_t21x/bl_update_payload", "opt/ota_package/t21x/bl_update_payload")
 ]
 
+l4t_patches_xavier = [
+  ("cboot_t194.bin", "bootloader")
+]
 
 class Board:
-  def __init__(self, name, bundle_name, build_dir, files, dtb_filters, bups, kernel_extra, bootloader_payload, tools_version):
+  def __init__(self, name, bundle_name, build_dir, files, dtb_filters, bups, kernel_extra, bootloader_payload, tools_version, l4t_patches):
     self.name = name
     self.bundle_name = bundle_name
     self.build_dir = build_dir
@@ -67,11 +70,14 @@ def __init__(self, name, bundle_name, build_dir, files, dtb_filters, bups, kerne
     self.kernel_extra_files = kernel_extra
     self.bootloader_payload_files = bootloader_payload
     self.l4t_tools_version = tools_version
+    self.l4t_patches = l4t_patches
 
 
 known_boards = {
-  '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"),
+  'nano':   ("Nano, Nano 2GB", "nano", "nano", get_nano_upstream_files, ['tegra210'], ['t21x'],
+             kernel_extra_files_nano, bootloader_payload_files_nano, "32.7.1-20220219090432", None),
+  '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", l4t_patches_xavier),
 }
 
 
@@ -80,7 +86,7 @@ def boards(args):
   build_dir = build.build_dir(args)
 
   def mk_board(brd):
-    return Board(brd[0], brd[2], build_dir(brd[1]), brd[3](UpstreamFile), brd[4], brd[5], brd[6], brd[7],brd[8])
+    return Board(brd[0], brd[2], build_dir(brd[1]), brd[3](UpstreamFile), brd[4], brd[5], brd[6], brd[7],brd[8],brd[9])
 
   UpstreamFile = upstream.upstream(args)
   return [mk_board(known_boards[board]) for board in args.boards]

avt_build/jetson_build/files/l4t-patches/cboot_t194.bin

@@ -3,6 +3,8 @@
 from . import tools
 from . import common
 
+from pathlib import Path, PurePath
+
 def clean(args, board):
   logging.info(f"Cleaning {board.name} in {board.build_dir}")
 
@@ -19,4 +21,8 @@ def prepare(args, board):
   logging.warning("Extracting public_sources DISABLED")
   #t.extract(board.files.public_sources, board.build_dir)
   #t.execute(['sudo', './apply_binaries.sh'], cwd=board.build_dir / 'Linux_for_Tegra')
-  
+  if board.l4t_patches is not None:
+    logging.info("Appling L4T patches")
+    base_dir = Path(__file__).parent
+    for patch in board.l4t_patches:
+      t.execute(['cp', base_dir / 'files/l4t-patches' / patch[0], board.build_dir / 'Linux_for_Tegra' / patch[1]], sudo=True)

avt_build/jetson_build/prepare.py

@@ -1,74 +1,74 @@
-/*
- * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include <dt-bindings/gpio/tegra-gpio.h>
-
-/ {
-	gpio: gpio@6000d000 {
-		gpio-init-names = "default";
-		gpio-init-0 = <&gpio_default>;
-
-		gpio_default: default {
-			gpio-input = <
-				TEGRA_GPIO(X, 1)
-				TEGRA_GPIO(X, 5)
-				TEGRA_GPIO(X, 6)
-				TEGRA_GPIO(X, 7)
-				TEGRA_GPIO(Y, 0)
-				TEGRA_GPIO(V, 3)
-				TEGRA_GPIO(K, 7)
-				TEGRA_GPIO(I, 1)
-				TEGRA_GPIO(H, 6)
-				TEGRA_GPIO(K, 4)
-				TEGRA_GPIO(K, 6)
-				TEGRA_GPIO(L, 1)
-				TEGRA_GPIO(Z, 2)
-				TEGRA_GPIO(Z, 0)
-				TEGRA_GPIO(CC, 1)
-				TEGRA_GPIO(H, 2)
-				TEGRA_GPIO(H, 5)
-				TEGRA_GPIO(Y, 1)
-				TEGRA_GPIO(A, 5)
-				TEGRA_GPIO(X, 4)
-				>;
-			gpio-output-low = <
-				TEGRA_GPIO(S, 4)
-				TEGRA_GPIO(S, 5)
-				TEGRA_GPIO(S, 6)
-				TEGRA_GPIO(S, 7)
-				TEGRA_GPIO(T, 0)
-				TEGRA_GPIO(T, 1)
-				TEGRA_GPIO(Z, 3)
-				TEGRA_GPIO(I, 0)
-				TEGRA_GPIO(V, 6)
-				TEGRA_GPIO(V, 1)
-				TEGRA_GPIO(V, 2)
-				TEGRA_GPIO(I, 2)
-				TEGRA_GPIO(K, 5)
-				TEGRA_GPIO(V, 5)
-				TEGRA_GPIO(H, 0)
-				TEGRA_GPIO(H, 1)
-				TEGRA_GPIO(H, 3)
-				TEGRA_GPIO(H, 4)
-				TEGRA_GPIO(BB, 2)
-				>;
-			gpio-output-high = <
-				>;
-		};
-	};
-};
+/*
+ * Copyright (c) 2019, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include <dt-bindings/gpio/tegra-gpio.h>
+
+/ {
+	gpio: gpio@6000d000 {
+		gpio-init-names = "default";
+		gpio-init-0 = <&gpio_default>;
+
+		gpio_default: default {
+			gpio-input = <
+				TEGRA_GPIO(X, 1)
+				TEGRA_GPIO(X, 5)
+				TEGRA_GPIO(X, 6)
+				TEGRA_GPIO(X, 7)
+				TEGRA_GPIO(Y, 0)
+				TEGRA_GPIO(V, 3)
+				TEGRA_GPIO(K, 7)
+				TEGRA_GPIO(I, 1)
+				TEGRA_GPIO(H, 6)
+				TEGRA_GPIO(K, 4)
+				TEGRA_GPIO(K, 6)
+				TEGRA_GPIO(L, 1)
+				TEGRA_GPIO(Z, 2)
+				TEGRA_GPIO(Z, 0)
+				TEGRA_GPIO(CC, 1)
+				TEGRA_GPIO(H, 2)
+				TEGRA_GPIO(H, 5)
+				TEGRA_GPIO(Y, 1)
+				TEGRA_GPIO(A, 5)
+				TEGRA_GPIO(X, 4)
+				>;
+			gpio-output-low = <
+				TEGRA_GPIO(S, 4)
+				TEGRA_GPIO(S, 5)
+				TEGRA_GPIO(S, 6)
+				TEGRA_GPIO(S, 7)
+				TEGRA_GPIO(T, 0)
+				TEGRA_GPIO(T, 1)
+				TEGRA_GPIO(Z, 3)
+				TEGRA_GPIO(I, 0)
+				TEGRA_GPIO(V, 6)
+				TEGRA_GPIO(V, 1)
+				TEGRA_GPIO(V, 2)
+				TEGRA_GPIO(I, 2)
+				TEGRA_GPIO(K, 5)
+				TEGRA_GPIO(V, 5)
+				TEGRA_GPIO(H, 0)
+				TEGRA_GPIO(H, 1)
+				TEGRA_GPIO(H, 3)
+				TEGRA_GPIO(H, 4)
+				TEGRA_GPIO(BB, 2)
+				>;
+			gpio-output-high = <
+				>;
+		};
+	};
+};