Skip to content

Commit 1c6acb7

Browse files
fkesselerfkesseler
committed
Imported l4t-32.7.1 / driver 4.0.0 final code
1 parent 998e4f7 commit 1c6acb7

File tree

32 files changed

+1538
-264
lines changed

32 files changed

+1538
-264
lines changed

‎avt_build/jetson_build/board.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from . import upstream
44
from . import build
55

6-
AVT_RELEASE = "4.0.0~beta1"
6+
AVT_RELEASE = "4.0.0"
77
KERNEL_RELEASE = "4.9.253-tegra"
88
L4T_VERSION = "32.7.1"
99

@@ -70,8 +70,8 @@ def __init__(self, name, bundle_name, build_dir, files, dtb_filters, bups, kerne
7070

7171

7272
known_boards = {
73-
'nano': ("Nano, Nano 2GB", "nano", get_nano_upstream_files, ['tegra210'], ['t21x'], kernel_extra_files_nano,bootloader_payload_files_nano, "32.7.1-20220219090432"),
74-
'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"),
73+
'nano': ("Nano, Nano 2GB", "nano", "nano", get_nano_upstream_files, ['tegra210'], ['t21x'], kernel_extra_files_nano,bootloader_payload_files_nano, "32.7.1-20220219090432"),
74+
'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"),
7575
}
7676

7777

@@ -80,7 +80,7 @@ def boards(args):
8080
build_dir = build.build_dir(args)
8181

8282
def mk_board(brd):
83-
return Board(brd[0], brd[1], build_dir(brd[1]), brd[2](UpstreamFile), brd[3], brd[4], brd[5], brd[6],brd[7])
83+
return Board(brd[0], brd[2], build_dir(brd[1]), brd[3](UpstreamFile), brd[4], brd[5], brd[6], brd[7],brd[8])
8484

8585
UpstreamFile = upstream.upstream(args)
8686
return [mk_board(known_boards[board]) for board in args.boards]

‎avt_build/jetson_build/deploy.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,11 @@ def build_tar_bundle(args, board):
210210
base_dir = Path(__file__).parent
211211
p = board.build_dir / "Linux_for_Tegra/kernel/avt/"
212212
template_args = t.get_template_args(board)
213-
bundle_name = string.Template("AlliedVision_NVidia_${BOARD_NAME}_L4T_${L4T_VERSION}_${AVT_RELEASE}").substitute(template_args)
213+
if board.bundle_name is None:
214+
bundle_name = string.Template("AlliedVision_NVidia_L4T_${L4T_VERSION}_${AVT_RELEASE}").substitute(template_args)
215+
else:
216+
bundle_name = string.Template("AlliedVision_NVidia_${BOARD_NAME}_L4T_${L4T_VERSION}_${AVT_RELEASE}").substitute(template_args)
217+
214218

215219
bundle_file = p / f'{bundle_name}.tar.gz'
216220

‎avt_build/jetson_build/files/bootloader/config

+24-10
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,33 @@ class NvSpecInformation:
5050

5151

5252
class Configuration:
53-
def __init__(self, name, dtb, board_sku, board_ver=None):
53+
def __init__(self, name, dtb, board_sku, board_ver=None, beta=False):
5454
self.name = name
55+
self.beta = beta
5556
self.dtb = dtb
5657
self.board_sku = board_sku
5758
self.board_ver = board_ver
5859

5960

6061
tx2_devkit = BoardDefinition('Jetson TX2 devkit', '0x18', '3310', [
6162
Configuration('2 cameras', 'tegra186-quill-p3310-1000-a00-00-avt-14375-2cam.dtb', '1000'),
62-
Configuration('3 cameras', 'tegra186-quill-p3310-1000-a00-00-avt-14385-3cam.dtb', '1000'),
63-
Configuration('6 cameras with 2 addresses', 'tegra186-quill-p3310-1000-a00-00-avt-14385-6cam2addr.dtb', '1000'),
64-
Configuration('6 cameras with 6 addresses', 'tegra186-quill-p3310-1000-a00-00-avt-14385-6cam6addr.dtb', '1000'),
63+
Configuration('3 cameras (beta)', 'tegra186-quill-p3310-1000-a00-00-avt-14385-3cam.dtb', '1000', beta=True),
64+
Configuration('6 cameras with 2 addresses (beta)', 'tegra186-quill-p3310-1000-a00-00-avt-14385-6cam2addr.dtb', '1000', beta=True),
65+
Configuration('6 cameras with 6 addresses (beta)', 'tegra186-quill-p3310-1000-a00-00-avt-14385-6cam6addr.dtb', '1000', beta=True),
6566
Configuration('None', 'tegra186-quill-p3310-1000-c03-00-base.dtb', '1000'),
6667
])
6768

6869
tx2_nx_devkit = BoardDefinition('Jetson TX2 NX devkit', '0x18', '3636', [
6970
Configuration('DevKit', 'tegra186-p3636-0001-p3509-0000-a01.dtb', '0001'),
71+
Configuration('Auvidea JNX30D (beta)', 'tegra186-p3636-0001-auvidea-jnx30d-avt.dtb', '0001', beta=True),
7072
])
7173

7274
agx_devkit = BoardDefinition('Jetson AGX Xavier devkit', '0x19', '2888', [
7375
Configuration('2 cameras', 'tegra194-p2888-0001-p2822-0000-avt-14375-2cam.dtb', '0001'),
7476
Configuration('2 cameras', 'tegra194-p2888-0001-p2822-0000-avt-14375-2cam.dtb', '0004'),
7577

76-
Configuration('6 cameras', 'tegra194-p2888-0001-p2822-0000-avt-14385-6cam.dtb', '0001'),
77-
Configuration('6 cameras', 'tegra194-p2888-0001-p2822-0000-avt-14385-6cam.dtb', '0004'),
78+
Configuration('6 cameras (beta)', 'tegra194-p2888-0001-p2822-0000-avt-14385-6cam.dtb', '0001', beta=True),
79+
Configuration('6 cameras (beta)', 'tegra194-p2888-0001-p2822-0000-avt-14385-6cam.dtb', '0004', beta=True),
7880

7981
Configuration('None', 'tegra194-p2888-0001-p2822-0000.dtb', '0001'),
8082
Configuration('None', 'tegra194-p2888-0001-p2822-0000.dtb', '0004'),
@@ -83,15 +85,23 @@ agx_devkit = BoardDefinition('Jetson AGX Xavier devkit', '0x19', '2888', [
8385
nx_devkit = BoardDefinition('Jetson Xavier NX devkit', '0x19', '3668', [
8486
Configuration('DevKit', 'tegra194-p3668-all-p3509-0000-avt.dtb', '0000'),
8587
Configuration('DevKit', 'tegra194-p3668-all-p3509-0000-avt.dtb', '0001'),
88+
#NX 16GB
89+
Configuration('DevKit', 'tegra194-p3668-all-p3509-0000-avt.dtb', '0003'),
8690

87-
Configuration('Auvidea JNX30', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0000'),
88-
Configuration('Auvidea JNX30', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0001'),
91+
Configuration('Auvidea JNX30 (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0000', beta=True),
92+
Configuration('Auvidea JNX30 (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0001', beta=True),
93+
#NX 16GB
94+
Configuration('Auvidea JNX30 (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30.dtb', '0003', beta=True),
8995

90-
Configuration('Auvidea JNX30+38491 FPD-Link', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0000'),
91-
Configuration('Auvidea JNX30+38491 FPD-Link', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0001'),
96+
Configuration('Auvidea JNX30+38491 FPD-Link (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0000', beta=True),
97+
Configuration('Auvidea JNX30+38491 FPD-Link (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0001', beta=True),
98+
#NX 16GB
99+
Configuration('Auvidea JNX30+38491 FPD-Link (beta)', 'tegra194-p3668-all-p3509-0000-auvidea-jnx30-38491.dtb', '0003', beta=True),
92100

93101
Configuration('None', 'tegra194-p3668-all-p3509-0000.dtb', '0000'),
94102
Configuration('None', 'tegra194-p3668-all-p3509-0000.dtb', '0001'),
103+
#NX 16GB
104+
Configuration('None', 'tegra194-p3668-all-p3509-0000.dtb', '0003'),
95105
])
96106

97107
nano_devkit = BoardDefinition('Jetson Nano', '0x21', '3448', [
@@ -285,6 +295,10 @@ def main():
285295
new_option = db.getString('avt-nvidia-l4t-bootloader/target-board')
286296
for i in range(len(config_list)):
287297
if config_list[i] == new_option:
298+
if active_board.configurations()[i].beta:
299+
db.forceInput(debconf.HIGH, 'avt-nvidia-l4t-bootloader/beta-warning')
300+
db.command('GO')
301+
288302
active_board.update_active_configuration(i)
289303
break
290304

‎avt_build/jetson_build/files/bootloader/control

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Maintainer: Allied Vision Technologies GmbH
44
Package: avt-nvidia-l4t-bootloader
55
Architecture: arm64
66
Pre-Depends: nvidia-l4t-core (>> 32.7-0), nvidia-l4t-core (<< 32.8-0)
7-
Depends: nvidia-l4t-tools (= ${L4T_TOOLS_VERSION}), nvidia-l4t-init (>> 32.7-0), nvidia-l4t-init (<< 32.8-0)
8-
Conflicts: nvidia-l4t-bootloader
7+
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)
8+
Conflicts: nvidia-l4t-bootloader (<< 32.8-0)
99
Section: bootloader
1010
Priority: standard
1111
Homepage: http://developer.nvidia.com/jetson

‎avt_build/jetson_build/files/bootloader/templates

+5
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,8 @@ Type: select
33
Choices: ${board-configurations}
44
Default: ${default-board-configuration}
55
Description: Select board configuration:
6+
7+
Template: avt-nvidia-l4t-bootloader/beta-warning
8+
Type: note
9+
Description: WARNING: beta configuration selected!
10+
The selected configuration is in beta state and not validated.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Package: avt-nvidia-l4t-kernel
55
Architecture: arm64
66
Pre-Depends: nvidia-l4t-core (>> 32.7-0), nvidia-l4t-core (<< 32.8-0)
77
Depends: nvidia-l4t-tools (>> 32.7-0), nvidia-l4t-tools (<< 32.8-0)
8-
Conflicts: nvidia-l4t-kernel
8+
Conflicts: nvidia-l4t-kernel (<< 32.8-0)
99
Section: kernel
1010
Priority: standard
1111
Homepage: http://developer.nvidia.com/jetson

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Package: avt-nvidia-l4t-kernel-dtbs
55
Architecture: arm64
66
Pre-Depends: nvidia-l4t-core (>> 32.7-0), nvidia-l4t-core (<< 32.8-0)
77
Depends: device-tree-compiler, avt-nvidia-l4t-kernel (= ${KERNEL_RELEASE}-${L4T_VERSION}-${AVT_RELEASE})
8-
Conflicts: nvidia-l4t-kernel-dtbs
8+
Conflicts: nvidia-l4t-kernel-dtbs (<< 32.8-0)
99
Section: kernel
1010
Priority: standard
1111
Homepage: http://developer.nvidia.com/jetson

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Package: avt-nvidia-l4t-kernel-headers
55
Architecture: arm64
66
Pre-Depends: nvidia-l4t-core (>> 32.7-0), nvidia-l4t-core (<< 32.8-0)
77
Depends: libc6, avt-nvidia-l4t-kernel (= ${KERNEL_RELEASE}-${L4T_VERSION}-${AVT_RELEASE})
8-
Conflicts: nvidia-l4t-kernel-headers
8+
Conflicts: nvidia-l4t-kernel-headers (<< 32.8-0)
99
Section: kernel
1010
Priority: standard
1111
Homepage: http://developer.nvidia.com/jetson

‎avt_build/jetson_build/tools.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ def get_template_args(board):
1717
if avt_release is None:
1818
process = subprocess.run(['git','rev-parse','--short','HEAD'],stdout=subprocess.PIPE)
1919
git_hash = process.stdout.decode("utf-8").strip()
20-
avt_release = f'dev-{git_hash}'
20+
avt_release = f'{AVT_RELEASE}~g{git_hash}'
2121

2222
template_args = {
2323
"L4T_TOOLS_VERSION": board.l4t_tools_version,
2424
"KERNEL_RELEASE": KERNEL_RELEASE,
2525
"L4T_VERSION": L4T_VERSION,
26-
"AVT_RELEASE": AVT_RELEASE,
26+
"AVT_RELEASE": avt_release,
2727
"BOARD_NAME": board.bundle_name
2828
}
2929
return template_args

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

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ makefile-path := platform/t18x/lanai/kernel-dts
77
dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-p3509-0000-a01.dtb
88
dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0002-p3509-0000-a01.dtb
99
dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0002-lanai.dtb
10+
dtb-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-auvidea-jnx30d-avt.dtb
1011
dtbo-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-p3509-0000-a01-adafruit-sph0645lm4h.dtbo
1112
dtbo-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-p3509-0000-a01-adafruit-uda1334a.dtbo
1213
dtbo-$(CONFIG_ARCH_TEGRA_18x_SOC) += tegra186-p3636-0001-p3509-0000-a01-fe-pi-audio.dtbo

0 commit comments

Comments
 (0)