Skip to content

Commit b20569f

Browse files
Kontra2BKontra2B
committed
specific source folders
1 parent e5f22e7 commit b20569f

7 files changed

Lines changed: 104 additions & 107 deletions

File tree

‎apply_patches.sh‎

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ while [[ $# -gt 0 ]]; do
2525
echo "$0 [--one-cam | --dual-cam | --max96712-EVB | --fg12-16ch | --fg12-16ch-dual ] [reset] [-h]"
2626
echo -e 'reset\t: hard reset (git) to version from jetpack_version file'
2727
echo -e '-h\t: show this help'
28-
break
28+
exit 0
2929
fi
3030
shift
3131
done
@@ -44,11 +44,11 @@ fi
4444

4545
# NVIDIA SDK Manager's JetPack 4.6.1 source_sync.sh doesn't set the right folder name, it mismatches with the direct tar
4646
# package source code. Correct the folder name.
47-
if [[ "$ACTION" == apply && -d "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen-industrial-dts" ]]; then
48-
mv sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen-industrial-dts sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen-industrial
47+
if [[ "$ACTION" == apply && -d "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen-industrial-dts" ]]; then
48+
mv ${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen-industrial-dts ${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen-industrial
4949
fi
50-
if [[ "$ACTION" == reset && -d "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen-industrial" ]]; then
51-
rm -rfv "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen-industrial" > /dev/null
50+
if [[ "$ACTION" == reset && -d "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen-industrial" ]]; then
51+
rm -rfv "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen-industrial" > /dev/null
5252
fi
5353

5454
# Create nvethernetrm symlink for JP 6.x (moved from source_sync_6.x.sh)
@@ -57,32 +57,33 @@ fi
5757
# and ln -sf cannot replace a directory with a symlink
5858
if ! version_lt "$JETPACK_VERSION" 6.0; then
5959
if [[ "$ACTION" == reset ]] || [[ "$ACTION" == apply ]]; then
60-
rm -rf "sources_${JETPACK_VERSION}/nvidia-oot/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm"
61-
ln -sf ../../../../../../nvethernetrm "sources_${JETPACK_VERSION}/nvidia-oot/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm"
60+
rm -rf "${BUILD_SRCS}/nvidia-oot/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm"
61+
ln -sf ../../../../../../nvethernetrm "${BUILD_SRCS}/nvidia-oot/drivers/net/ethernet/nvidia/nvethernet/nvethernetrm"
6262
fi
6363
fi
6464

6565
apply_external_patches() {
66-
git -C "sources_${JETPACK_VERSION}/$2" status > /dev/null
66+
local source="${BUILD_SRCS}/$2"
67+
git -C "${source}" status > /dev/null
6768
if [[ "$ACTION" == 'apply' ]]; then
68-
if ! git -C "sources_${JETPACK_VERSION}/$2" diff --quiet || ! git -C "sources_${JETPACK_VERSION}/$2" diff --cached --quiet; then
69-
read -p "Repo sources_${JETPACK_VERSION}/$2 has changes that may disturb applying patches. Continue (Y/n)? " confirm
69+
if ! git -C "${source}" diff --quiet || ! git -C "${source}" diff --cached --quiet; then
70+
read -p "Repo ${source} has changes that may disturb applying patches. Continue (Y/n)? " confirm
7071
[[ -n "$confirm" && "$confirm" != "y" && "$confirm" != "Y" ]] && exit 1
7172
fi
7273
echo -e "\e[33m$(ls -Ld ${PWD}/$2/$1)\e[0m"
7374
ls -Lw1 "${PWD}/$2/$1"
74-
git -C "sources_${JETPACK_VERSION}/$2" apply "${PWD}/$2/$1"/*
75+
git -C "${source}" apply "${PWD}/$2/$1"/*
7576
elif [[ "$ACTION" = "reset" ]]; then
76-
if ! git -C "sources_${JETPACK_VERSION}/$2" diff --quiet || ! git -C "sources_${JETPACK_VERSION}/$2" diff --cached --quiet; then
77-
read -p "Repo sources_${JETPACK_VERSION}/$2 has changes that will be hard reset. Continue (Y/n)? " confirm
77+
if ! git -C "${source}" diff --quiet || ! git -C "${source}" diff --cached --quiet; then
78+
read -p "Repo ${source} has changes that will be hard reset. Continue (Y/n)? " confirm
7879
[[ -n "$confirm" && "$confirm" != "y" && "$confirm" != "Y" ]] && exit 1
7980
fi
80-
echo -n "$(ls -d "sources_${JETPACK_VERSION}/$2"): "
81-
git -C "sources_${JETPACK_VERSION}/$2" reset --hard $L4T_VERSION
81+
echo -n "$(ls -d ${source}): "
82+
git -C "${source}" reset --hard $L4T_VERSION
8283
fi
8384
}
8485

85-
if [[ ! -d "sources_${JETPACK_VERSION}" ]]; then
86+
if [[ ! -d "${BUILD_SRCS}" ]]; then
8687
echo "Sources folder not found. Run ./setup_workspace.sh first"
8788
exit 2
8889
fi
@@ -100,39 +101,39 @@ fi
100101
echo "Patches applied successfully"
101102

102103
if [[ "$ACTION" = "apply" ]]; then
103-
version_lt "$JETPACK_VERSION" "5.0" || ln -f kernel/realsense/d4xx.c "sources_${JETPACK_VERSION}/${D4XX_SRC_DST}/drivers/media/i2c/"
104+
version_lt "$JETPACK_VERSION" "5.0" || ln -f kernel/realsense/d4xx.c "${BUILD_SRCS}/${D4XX_SRC_DST}/drivers/media/i2c/"
104105
if version_lt "$JETPACK_VERSION" "6.0"; then
105106
# device tree
106-
cp "hardware/realsense/${JP5_D4XX_DTSI}" "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi"
107+
cp "hardware/realsense/${JP5_D4XX_DTSI}" "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi"
107108
# max96712 header
108-
cp kernel/nvidia/max96712.h "sources_${JETPACK_VERSION}/kernel/nvidia/include/media/"
109+
cp kernel/nvidia/max96712.h "${BUILD_SRCS}/kernel/nvidia/include/media/"
109110
else
110111
# max96712 header
111-
ln -f nvidia-oot/max96712.h "sources_${JETPACK_VERSION}/nvidia-oot/include/media/"
112+
ln -f nvidia-oot/max96712.h "${BUILD_SRCS}/nvidia-oot/include/media/"
112113
if version_lt "$JETPACK_VERSION" "7.0"; then
113114
# jp6 overlay
114-
ln -f hardware/realsense/tegra234-camera-d4xx-overlay*.dts "sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public/overlay/"
115-
ln -f sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public/include/platforms/dt-bindings/tegra234-p3737-0000+p3701-0000.h \
116-
sources_${JETPACK_VERSION}/$KERNEL_DIR/include/dt-bindings/
115+
ln -f hardware/realsense/tegra234-camera-d4xx-overlay*.dts "${BUILD_SRCS}/hardware/nvidia/t23x/nv-public/overlay/"
116+
ln -f ${BUILD_SRCS}/hardware/nvidia/t23x/nv-public/include/platforms/dt-bindings/tegra234-p3737-0000+p3701-0000.h \
117+
${BUILD_SRCS}/$KERNEL_DIR/include/dt-bindings/
117118
else
118119
# Copy tegra264-gpio.h for Thor overlay compilation if not already present
119-
if [[ ! -f "sources_${JETPACK_VERSION}/$KERNEL_DIR/include/dt-bindings/gpio/tegra264-gpio.h" ]]; then
120-
ln -f "sources_${JETPACK_VERSION}/$KERNEL_DIR/3rdparty/canonical/linux-noble/include/dt-bindings/gpio/tegra264-gpio.h" \
121-
"sources_${JETPACK_VERSION}/$KERNEL_DIR/include/dt-bindings/gpio/" 2>/dev/null || true
120+
if [[ ! -f "${BUILD_SRCS}/$KERNEL_DIR/include/dt-bindings/gpio/tegra264-gpio.h" ]]; then
121+
ln -f "${BUILD_SRCS}/$KERNEL_DIR/3rdparty/canonical/linux-noble/include/dt-bindings/gpio/tegra264-gpio.h" \
122+
"${BUILD_SRCS}/$KERNEL_DIR/include/dt-bindings/gpio/" 2>/dev/null || true
122123
fi
123-
ln -f hardware/realsense/tegra264-camera-d4xx-overlay*.dtso "sources_${JETPACK_VERSION}/$KERNEL_DIR/arch/arm64/boot/dts/nvidia/"
124+
ln -f hardware/realsense/tegra264-camera-d4xx-overlay*.dtso "${BUILD_SRCS}/$KERNEL_DIR/arch/arm64/boot/dts/nvidia/"
124125
fi
125126
fi
126127

127128
# Stage all modified files after patching
128-
git -C "sources_${JETPACK_VERSION}/$D4XX_SRC_DST" add drivers/media/i2c/d4xx.c
129-
git -C "sources_${JETPACK_VERSION}/$D4XX_SRC_DST" add -u
130-
[[ -d "sources_${JETPACK_VERSION}/$KERNEL_DIR" ]] && git -C "sources_${JETPACK_VERSION}/$KERNEL_DIR" add -A
131-
if [[ -d "sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public" ]]; then
132-
git -C "sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public" add -A
129+
git -C "${BUILD_SRCS}/$D4XX_SRC_DST" add drivers/media/i2c/d4xx.c
130+
git -C "${BUILD_SRCS}/$D4XX_SRC_DST" add -u
131+
[[ -d "${BUILD_SRCS}/$KERNEL_DIR" ]] && git -C "${BUILD_SRCS}/$KERNEL_DIR" add -A
132+
if [[ -d "${BUILD_SRCS}/hardware/nvidia/t23x/nv-public" ]]; then
133+
git -C "${BUILD_SRCS}/hardware/nvidia/t23x/nv-public" add -A
133134
fi
134-
if [[ -d "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts" ]]; then
135-
git -C "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts" add -A
135+
if [[ -d "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts" ]]; then
136+
git -C "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts" add -A
136137
fi
137138

138139
# Get author identity from root repo
@@ -150,33 +151,33 @@ if [[ "$ACTION" = "apply" ]]; then
150151
fi
151152

152153
# Update local git identity for subrepos
153-
git -C "sources_${JETPACK_VERSION}/$D4XX_SRC_DST" config user.name "$GIT_AUTHOR_NAME"
154-
git -C "sources_${JETPACK_VERSION}/$D4XX_SRC_DST" config user.email "$GIT_AUTHOR_EMAIL"
155-
if [[ -d "sources_${JETPACK_VERSION}/$KERNEL_DIR" ]]; then
156-
git -C "sources_${JETPACK_VERSION}/$KERNEL_DIR" config user.name "$GIT_AUTHOR_NAME"
157-
git -C "sources_${JETPACK_VERSION}/$KERNEL_DIR" config user.email "$GIT_AUTHOR_EMAIL"
154+
git -C "${BUILD_SRCS}/$D4XX_SRC_DST" config user.name "$GIT_AUTHOR_NAME"
155+
git -C "${BUILD_SRCS}/$D4XX_SRC_DST" config user.email "$GIT_AUTHOR_EMAIL"
156+
if [[ -d "${BUILD_SRCS}/$KERNEL_DIR" ]]; then
157+
git -C "${BUILD_SRCS}/$KERNEL_DIR" config user.name "$GIT_AUTHOR_NAME"
158+
git -C "${BUILD_SRCS}/$KERNEL_DIR" config user.email "$GIT_AUTHOR_EMAIL"
158159
fi
159-
if [[ -d "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts" ]]; then
160-
git -C "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts" config user.name "$GIT_AUTHOR_NAME"
161-
git -C "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts" config user.email "$GIT_AUTHOR_EMAIL"
160+
if [[ -d "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts" ]]; then
161+
git -C "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts" config user.name "$GIT_AUTHOR_NAME"
162+
git -C "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts" config user.email "$GIT_AUTHOR_EMAIL"
162163
fi
163-
if [[ -d "sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public" ]]; then
164-
git -C "sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public" config user.name "$GIT_AUTHOR_NAME"
165-
git -C "sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public" config user.email "$GIT_AUTHOR_EMAIL"
164+
if [[ -d "${BUILD_SRCS}/hardware/nvidia/t23x/nv-public" ]]; then
165+
git -C "${BUILD_SRCS}/hardware/nvidia/t23x/nv-public" config user.name "$GIT_AUTHOR_NAME"
166+
git -C "${BUILD_SRCS}/hardware/nvidia/t23x/nv-public" config user.email "$GIT_AUTHOR_EMAIL"
166167
fi
167168

168169
# Commit all staged files
169-
git -C "sources_${JETPACK_VERSION}/$D4XX_SRC_DST" commit -m "RS patched" || true
170-
[[ -d "sources_${JETPACK_VERSION}/$KERNEL_DIR" ]] && git -C "sources_${JETPACK_VERSION}/$KERNEL_DIR" commit -m "RS patched" || true
171-
if [[ -d "sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public" ]]; then
172-
git -C "sources_${JETPACK_VERSION}/hardware/nvidia/t23x/nv-public" commit -m "RS patched" || true
170+
git -C "${BUILD_SRCS}/$D4XX_SRC_DST" commit -m "RS patched" || true
171+
[[ -d "${BUILD_SRCS}/$KERNEL_DIR" ]] && git -C "${BUILD_SRCS}/$KERNEL_DIR" commit -m "RS patched" || true
172+
if [[ -d "${BUILD_SRCS}/hardware/nvidia/t23x/nv-public" ]]; then
173+
git -C "${BUILD_SRCS}/hardware/nvidia/t23x/nv-public" commit -m "RS patched" || true
173174
fi
174-
if [[ -d "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts" ]]; then
175-
git -C "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts" commit -m "RS patched" || true
175+
if [[ -d "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts" ]]; then
176+
git -C "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts" commit -m "RS patched" || true
176177
fi
177178
elif [[ "$ACTION" = "reset" ]]; then
178-
if version_lt "$JETPACK_VERSION" "5.0"; then
179-
rm "sources_${JETPACK_VERSION}/${D4XX_SRC_DST}/drivers/media/i2c/d4xx.c" || true
180-
rm "sources_${JETPACK_VERSION}/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi" || true
179+
if version_lt "$JP_INPUT_VERSION" "5.0"; then
180+
rm "${BUILD_SRCS}/${D4XX_SRC_DST}/drivers/media/i2c/d4xx.c" || true
181+
rm "${BUILD_SRCS}/hardware/nvidia/platform/t19x/galen/kernel-dts/common/tegra194-camera-d4xx.dtsi" || true
181182
fi
182183
fi

‎build_all.sh‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,16 @@ done
2626
export DEVDIR=$(cd `dirname $0` && pwd)
2727
NPROC=$(nproc)
2828

29-
. $DEVDIR/scripts/setup-common "$1"
30-
3129
if [[ "$1" == "-h" ]]; then
32-
echo "build_all.sh [--clean] [--dev-dbg] JetPack_version [JetPack_Linux_source]"
30+
echo "build_all.sh [--clean] [--dev-dbg] [JetPack_version [JetPack_Linux_source]]"
3331
echo "build_all.sh -h"
34-
exit 1
3532
fi
3633

37-
SRCS="$DEVDIR/sources_$JETPACK_VERSION"
34+
. scripts/setup-common "$1"
3835

36+
BUILD_SRCS="${DEVDIR}/${BUILD_SRCS}"
3937
if [[ -n "$2" ]]; then
40-
SRCS=$(realpath $2)
38+
BUILD_SRCS=$(realpath $2)
4139
fi
4240

4341
if [[ $(uname -m) == aarch64 ]]; then
@@ -64,7 +62,7 @@ export TEGRA_KERNEL_OUT="$DEVDIR/images/${JP_INPUT_VERSION}"
6462
if [[ $CLEAN == 1 ]]; then
6563
echo "Cleaning build artifacts for ${JP_INPUT_VERSION}..."
6664
rm -rf $TEGRA_KERNEL_OUT
67-
rm -rf $SRCS/out
65+
rm -rf $BUILD_SRCS/out
6866
fi
6967

7068
mkdir -p $TEGRA_KERNEL_OUT
@@ -78,7 +76,7 @@ export KERNEL_MODULES_OUT=$TEGRA_KERNEL_OUT/modules
7876
# https://docs.nvidia.com/jetson/archives/r36.2/DeveloperGuide/SD/Kernel/KernelCustomization.html#building-the-jetson-linux-kernel
7977
if version_lt "$JETPACK_VERSION" "6.0"; then
8078
#JP4/5
81-
cd $SRCS/$KERNEL_DIR
79+
cd $BUILD_SRCS/$KERNEL_DIR
8280
make O=$TEGRA_KERNEL_OUT tegra_defconfig
8381
if [[ "$DEVDBG" == "1" ]]; then
8482
scripts/config --file $TEGRA_KERNEL_OUT/.config --enable DYNAMIC_DEBUG
@@ -87,9 +85,9 @@ if version_lt "$JETPACK_VERSION" "6.0"; then
8785
make O=$TEGRA_KERNEL_OUT modules_install INSTALL_MOD_PATH=$KERNEL_MODULES_OUT
8886
D4XX_CMD_FILE="$(find "$TEGRA_KERNEL_OUT" -name '.d4xx.o.cmd' 2>/dev/null | head -1)"
8987
else
90-
cd $SRCS
91-
export KERNEL_HEADERS=$SRCS/$KERNEL_DIR
92-
ln -sf $TEGRA_KERNEL_OUT $SRCS/out
88+
cd $BUILD_SRCS
89+
export KERNEL_HEADERS=${BUILD_SRCS}/${KERNEL_DIR}
90+
ln -sf $TEGRA_KERNEL_OUT $BUILD_SRCS/out
9391
if [[ "$DEVDBG" == "1" ]]; then
9492
cd $KERNEL_HEADERS
9593
# Generate .config file from default defconfig
@@ -104,21 +102,21 @@ else
104102
# Remove unwanted
105103
rm defconfig .config
106104
make mrproper
107-
cd $SRCS
105+
cd $BUILD_SRCS
108106
# Building the Image with custom_defconfig
109107
make KERNEL_DEF_CONFIG=custom_defconfig -C kernel
110108
else
111109
# Building the Image with default defconfig
112110
make -C kernel
113111
fi
114112
make modules
115-
D4XX_CMD_FILE="$SRCS/nvidia-oot/drivers/media/i2c/.d4xx.o.cmd"
113+
D4XX_CMD_FILE="$BUILD_SRCS/nvidia-oot/drivers/media/i2c/.d4xx.o.cmd"
116114
mkdir -p $TEGRA_KERNEL_OUT/rootfs/boot/dtb
117115
if version_lt "$JETPACK_VERSION" "7.0"; then
118116
make dtbs
119-
cp $SRCS/nvidia-oot/device-tree/platform/generic-dts/dtbs/tegra234-camera-d4xx-overlay*.dtbo $TEGRA_KERNEL_OUT/rootfs/boot/
117+
cp $BUILD_SRCS/nvidia-oot/device-tree/platform/generic-dts/dtbs/tegra234-camera-d4xx-overlay*.dtbo $TEGRA_KERNEL_OUT/rootfs/boot/
120118
else
121-
cp $SRCS/$KERNEL_DIR/arch/arm64/boot/dts/nvidia/tegra2[36]4-camera-d4xx-overlay*.dtbo $TEGRA_KERNEL_OUT/rootfs/boot/
119+
cp $BUILD_SRCS/$KERNEL_DIR/arch/arm64/boot/dts/nvidia/tegra2[36]4-camera-d4xx-overlay*.dtbo $TEGRA_KERNEL_OUT/rootfs/boot/
122120
fi
123121
export INSTALL_MOD_PATH=$TEGRA_KERNEL_OUT/rootfs/
124122
make -C kernel install

‎kernel/realsense/d4xx.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ static int ds5_sensor_get_fmt(struct v4l2_subdev *sd,
16211621
fmt->format = *v4l2_subdev_get_try_format(sd, v4l2_state, fmt->pad);
16221622
#else
16231623
{
1624-
struct v4l2_mbus_framefmt * framefmt;
1624+
struct v4l2_mbus_framefmt* framefmt;
16251625
framefmt = v4l2_subdev_state_get_format(v4l2_state, fmt->pad);
16261626
if (framefmt)
16271627
fmt->format = *framefmt;
@@ -1740,7 +1740,7 @@ static int __ds5_sensor_set_fmt(struct ds5 *state, struct ds5_sensor *sensor,
17401740
*v4l2_subdev_get_try_format(&sensor->sd, v4l2_state, fmt->pad) = *mf;
17411741
#else
17421742
{
1743-
struct v4l2_mbus_framefmt * framefmt = v4l2_subdev_state_get_format(v4l2_state, fmt->pad);
1743+
struct v4l2_mbus_framefmt* framefmt = v4l2_subdev_state_get_format(v4l2_state, fmt->pad);
17441744
if (framefmt)
17451745
*framefmt = *mf;
17461746
else
@@ -5189,7 +5189,7 @@ static int ds5_mux_get_fmt(struct v4l2_subdev *sd,
51895189

51905190
/* Video ops */
51915191
static int ds5_mux_g_frame_interval(struct v4l2_subdev *sd,
5192-
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) || LINUX_VERSION_CODE > KERNEL_VERSION(6, 8, 0)
5192+
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) || LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)
51935193
struct v4l2_subdev_state *state,
51945194
#endif
51955195
struct v4l2_subdev_frame_interval *fi)
@@ -5226,7 +5226,7 @@ static u16 __ds5_probe_framerate(const struct ds5_resolution *res, u16 target)
52265226
}
52275227

52285228
static int ds5_mux_s_frame_interval(struct v4l2_subdev *sd,
5229-
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) || LINUX_VERSION_CODE > KERNEL_VERSION(6, 8, 0)
5229+
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0) || LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)
52305230
struct v4l2_subdev_state *state,
52315231
#endif
52325232
struct v4l2_subdev_frame_interval *fi)

‎nvidia-oot/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ nvgpu: conftest nvidia-oot
109109
define display-cmd
110110
$(MAKE) -j $(NPROC) ARCH=arm64 TARGET_ARCH=aarch64 \
111111
-C $(MAKEFILE_DIR)/nvdisplay \
112-
LOCALVERSION=$(version) \
113112
NV_VERBOSE=0 \
114113
KERNELRELEASE="" \
115114
SYSSRC=$(NVIDIA_HEADERS) \

‎scripts/setup-common‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SUPPORTED_JP="7.1, 7.0, 6.2.1, 6.2, 6.1, 6.0, 5.1.2, 5.0.2, 4.6.1"
44

55
if [[ $1 == "-h" ]]; then
66
echo supported JetPack versions: ${SUPPORTED_JP}
7-
exit 1
7+
exit 0
88
fi
99

1010
JP_INPUT_VERSION="$1"
@@ -17,11 +17,12 @@ fi
1717

1818
export JP_INPUT_VERSION
1919
export JETPACK_VERSION="${JP_INPUT_VERSION}"
20-
export REVISION="35.1"
21-
export L4T_VERSION=jetson_"${REVISION}"
22-
export KERNEL_DIR="kernel/kernel-5.10"
23-
export LICENSE=release
20+
REVISION="35.1"
21+
L4T_VERSION=jetson_"${REVISION}"
22+
KERNEL_DIR="kernel/kernel-5.10"
23+
LICENSE=release
2424
export ARCH=arm64
25+
BUILD_SRCS="sources_${JP_INPUT_VERSION}"
2526

2627
function version_lt {
2728
IFS='.' read -r -a v1 <<< "$1"

‎scripts/sync-sources.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ SCRIPT_NAME=`basename $0`
6161
# info about sources.
6262
# NOTE: *Add only kernel repos here. Add new repos separately below. Keep related repos together*
6363
# NOTE: nvethrnetrm.git should be listed after "linux-nv-oot.git" due to nesting of sync path
64-
if [[ -f scripts/sources_$JETPACK_VERSION ]]; then
65-
SOURCE_INFO=$(cat scripts/sources_$JETPACK_VERSION)
64+
if [[ -f scripts/sources_${JETPACK_VERSION} ]]; then
65+
SOURCE_INFO=$(cat scripts/sources_${JETPACK_VERSION})
6666
elif [[ -f scripts/sources_${JP_INPUT_VERSION} ]]; then
6767
SOURCE_INFO=$(cat scripts/sources_${JP_INPUT_VERSION})
6868
else
69-
echo "Sources information file, scripts/sources_$JETPACK_VERSION, is missing!"
69+
echo "Sources information file, scripts/sources_${JETPACK_VERSION}, is missing!"
7070
exit 1
7171
fi
7272

0 commit comments

Comments
 (0)