diff --git a/tools/ota_tools/version_upgrade/build_base_recovery_image.sh b/tools/ota_tools/version_upgrade/build_base_recovery_image.sh
index 3270c56..6ea494d 100755
--- a/tools/ota_tools/version_upgrade/build_base_recovery_image.sh
+++ b/tools/ota_tools/version_upgrade/build_base_recovery_image.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -28,7 +28,8 @@
# 4. Copy all these four files to <target BSP L4T dir>/bootloader
# The BASE version can be:
-# "R28.2", "R28.3", "R28.4", "R32.1", "R32.2", "R32.3", "R32.4" "R32.5" "R32.6"
+# "R28.2", "R28.3", "R28.4", "R32.1", "R32.2", "R32.3", "R32.4" "R32.5"
+# "R32.6", "R32.7"
set -e
KERNEL_DTB_NAME=
@@ -55,12 +56,12 @@
echo -ne "\t<target_board>: specify the target board.\n"
echo -ne "\t supported target boards: jetson-tx2-devkit, jetson-agx-xavier-devkit, jetson-xavier-nx-devkit, jetson-xavier-nx-devkit-emmc, jetson-xavier-nx-devkit-tx2-nx.\n"
echo -ne "\t<bsp version>: specify the version of the base BSP\n"
- echo -ne "\t supported versions: R28-2, R28-3, R28-4, R32-1, R32-2, R32-3, R32-4, R32-5, R32-6\n"
+ echo -ne "\t supported versions: R28-2, R28-3, R28-4, R32-1, R32-2, R32-3, R32-4, R32-5, R32-6, R32-7\n"
echo -ne "\t<base BSP L4T dir>: specify the path of the L4T dir of the base BSP\n"
echo -ne "\t<base BSP rootfs dir>: specify the path of the rootfs of the base BSP\n"
echo -ne "\t<target BSP L4T dir>: specify the path of the L4T dir of the target BSP\n"
echo -ne "Example:\n"
- echo -ne "\tsudo $0 -u PKCkeyfile -v SBKkeyfile jetson-tx2-devkit R28-3 <R28.3_BSP>/Linux_for_Tegra <R28.3_BSP>/Linux_for_Tegra/rootfs <R32.6_BSP>/Linux_for_Tegra\n"
+ echo -ne "\tsudo $0 -u PKCkeyfile -v SBKkeyfile jetson-tx2-devkit R28-3 <R28.3_BSP>/Linux_for_Tegra <R28.3_BSP>/Linux_for_Tegra/rootfs <R32.7_BSP>/Linux_for_Tegra\n"
exit 1
}
diff --git a/tools/ota_tools/version_upgrade/l4t_generate_ota_package.sh b/tools/ota_tools/version_upgrade/l4t_generate_ota_package.sh
index d4086d3..eefd712 100755
--- a/tools/ota_tools/version_upgrade/l4t_generate_ota_package.sh
+++ b/tools/ota_tools/version_upgrade/l4t_generate_ota_package.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -21,7 +21,7 @@
# DEALINGS IN THE SOFTWARE.
# This script generates OTA package, which used to ota from
-# R28.2/R28.3/R28.4/R32.1/R32.2/R32.3/R32.4/R32.5/R32.6 to R32-ToT.
+# R28.2/R28.3/R28.4/R32.1/R32.2/R32.3/R32.4/R32.5/R32.6/R32.7 to R32-ToT.
set -e
LINUX_BASE_DIR="$(pwd)"
@@ -74,7 +74,7 @@
echo -ne "\tWhere,\n"
echo -ne "\t\t<target board>: target board.\n"
echo -ne "\t\t Supported boards: jetson-tx2-devkit, jetson-agx-xavier-devkit, jetson-xavier-nx-devkit, jetson-xavier-nx-devkit-emmc, jetson-xavier-nx-devkit-tx2-nx.\n"
- echo -ne "\t\t<bsp version>: the version of the base BSP. Supported versions:R28-2, R28-3, R28-4, R32-1, R32-2, R32-3, R32-4, R32-5, R32-6;\n"
+ echo -ne "\t\t<bsp version>: the version of the base BSP. Supported versions:R28-2, R28-3, R28-4, R32-1, R32-2, R32-3, R32-4, R32-5, R32-6, R32-7;\n"
echo -ne "\toptions:\n"
echo -ne "\t\t-u <PKC key file>: PKC key used for odm fused board\n"
echo -ne "\t\t-v <SBK key file>: Secure Boot Key (SBK) key used for ODM fused board\n"
@@ -113,7 +113,7 @@
exit 1
fi
- # Skip check for the R32.3/R32.4/R32.5/R32.6 that have no partition layout changes
+ # Skip check for the R32.3/R32.4/R32.5/R32.6/R32.7 that have no partition layout changes
if [ "${LAYOUT_CHANGE}" == 0 ]; then
echo "No immediate partitions and skip it"
return 0
diff --git a/tools/ota_tools/version_upgrade/nv_ota_common.func b/tools/ota_tools/version_upgrade/nv_ota_common.func
index 46730a4..ffcf7dd 100644
--- a/tools/ota_tools/version_upgrade/nv_ota_common.func
+++ b/tools/ota_tools/version_upgrade/nv_ota_common.func
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2021-2022, NVIDIA CORPORATION. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@
_BASE_RECOVERY_IMAGE=
_BASE_RECOVERY_DTB=
# Base versions without layout change
-_BASE_VERSIONS_NO_LAYOUT_CHANGE=( "R32-3" "R32-4" "R32-5" "R32-6" )
+_BASE_VERSIONS_NO_LAYOUT_CHANGE=( "R32-3" "R32-4" "R32-5" "R32-6" "R32-7" )
_EXTLINUX_CONF_BACKUP="extlinux.conf.ota_backup"
_K_BYTES=1024
_NV_BOOT_CONTROL_CONF="nv_boot_control.conf"
diff --git a/tools/ota_tools/version_upgrade/nv_ota_update_without_layout_change.sh b/tools/ota_tools/version_upgrade/nv_ota_update_without_layout_change.sh
index bfb8e4f..3af69bd 100755
--- a/tools/ota_tools/version_upgrade/nv_ota_update_without_layout_change.sh
+++ b/tools/ota_tools/version_upgrade/nv_ota_update_without_layout_change.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2021-2022, NVIDIA CORPORATION. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -331,6 +331,18 @@
fi
cp -f "${src}" "${dst}"
done
+
+ # Also update nv-l4t-bootloader-config.sh as it is invoked by
+ # nv_bootloader_payload_updater now.
+ local bl_cfg_script="nv-l4t-bootloader-config.sh"
+ local bl_cfg_dir="/opt/nvidia/l4t-bootloader-config"
+ # We don't have nv-l4t-bootloader-config.sh for release versions
+ # prior to 32.4.2. Create the particular dir first for this case.
+ if [ ! -d "${bl_cfg_dir}" ]; then
+ mkdir -p "${bl_cfg_dir}"
+ fi
+ cp -f "${work_dir}/${bl_cfg_script}" "${bl_cfg_dir}"
+
return 0
}
diff --git a/tools/ota_tools/version_upgrade/ota_board_specs.conf b/tools/ota_tools/version_upgrade/ota_board_specs.conf
index 58ff151..8300229 100644
--- a/tools/ota_tools/version_upgrade/ota_board_specs.conf
+++ b/tools/ota_tools/version_upgrade/ota_board_specs.conf
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -78,6 +78,8 @@
JETSON_TX2_DEVKIT_R32_5_ALIAS="jetson_tx2_devkit_ota_emmc_r32_3_4_spec"
# shellcheck disable=SC2034
JETSON_TX2_DEVKIT_R32_6_ALIAS="jetson_tx2_devkit_ota_emmc_r32_3_4_spec"
+# shellcheck disable=SC2034
+JETSON_TX2_DEVKIT_R32_7_ALIAS="jetson_tx2_devkit_ota_emmc_r32_3_4_spec"
# jetson-agx-xavier-devkit
jetson_agx_xavier_devkit_ota_emmc_r32_1_2_spec=(
@@ -119,6 +121,8 @@
JETSON_AGX_XAVIER_DEVKIT_R32_5_ALIAS="jetson_agx_xavier_devkit_ota_emmc_r32_3_4_spec"
# shellcheck disable=SC2034
JETSON_AGX_XAVIER_DEVKIT_R32_6_ALIAS="jetson_agx_xavier_devkit_ota_emmc_r32_3_4_spec"
+# shellcheck disable=SC2034
+JETSON_AGX_XAVIER_DEVKIT_R32_7_ALIAS="jetson_agx_xavier_devkit_ota_emmc_r32_3_4_spec"
# jetson-xaiver-nx-devkit
jetson_xavier_nx_devkit_ota_sd_r32_4_spec=(
@@ -133,6 +137,8 @@
JETSON_XAVIER_NX_DEVKIT_R32_5_ALIAS="jetson_xavier_nx_devkit_ota_sd_r32_4_spec"
# shellcheck disable=SC2034
JETSON_XAVIER_NX_DEVKIT_R32_6_ALIAS="jetson_xavier_nx_devkit_ota_sd_r32_4_spec"
+# shellcheck disable=SC2034
+JETSON_XAVIER_NX_DEVKIT_R32_7_ALIAS="jetson_xavier_nx_devkit_ota_sd_r32_4_spec"
# jetson-xaiver-nx-devkit-emmc
jetson_xavier_nx_devkit_emmc_ota_emmc_r32_4_spec=(
@@ -147,6 +153,8 @@
JETSON_XAVIER_NX_DEVKIT_EMMC_R32_5_ALIAS="jetson_xavier_nx_devkit_emmc_ota_emmc_r32_4_spec"
# shellcheck disable=SC2034
JETSON_XAVIER_NX_DEVKIT_EMMC_R32_6_ALIAS="jetson_xavier_nx_devkit_emmc_ota_emmc_r32_4_spec"
+# shellcheck disable=SC2034
+JETSON_XAVIER_NX_DEVKIT_EMMC_R32_7_ALIAS="jetson_xavier_nx_devkit_emmc_ota_emmc_r32_4_spec"
# jetson-xaiver-nx-devkit-tx2-nx
jetson_xavier_nx_devkit_tx2_nx_ota_emmc_r32_5_spec=(
@@ -156,6 +164,8 @@
JETSON_XAVIER_NX_DEVKIT_TX2_NX_R32_5_ALIAS="jetson_xavier_nx_devkit_tx2_nx_ota_emmc_r32_5_spec"
# shellcheck disable=SC2034
JETSON_XAVIER_NX_DEVKIT_TX2_NX_R32_6_ALIAS="jetson_xavier_nx_devkit_tx2_nx_ota_emmc_r32_5_spec"
+# shellcheck disable=SC2034
+JETSON_XAVIER_NX_DEVKIT_TX2_NX_R32_7_ALIAS="jetson_xavier_nx_devkit_tx2_nx_ota_emmc_r32_5_spec"
# List the supported t18x devices and t19x devices
T18X_DEVICES=(