Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for L4T 32.2.1 / librealsense v2.29.0 #15

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions buildPatchedKernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# MIT License

LIBREALSENSE_DIRECTORY=${HOME}/librealsense
LIBREALSENSE_VERSION=v2.20.0
LIBREALSENSE_VERSION=v2.29.0


function usage
Expand Down Expand Up @@ -51,10 +51,10 @@ set -e
KERNEL_BUILD_VERSION=master
# Quotes around Jetson Board because the name may have a space, ie "AGX Xavier"
if [ "$JETSON_BOARD" == "AGX Xavier" ] ; then
L4TTarget="32.1.0"
# Test for 32.1.0 first
if [ $JETSON_L4T = "32.1.0" ] ; then
KERNEL_BUILD_VERSION=vL4T32.1.0
L4TTarget="32.2.1"
# Test for 32.2.1 first
if [ $JETSON_L4T = "32.2.1" ] ; then
KERNEL_BUILD_VERSION=vL4T32.2.1
else
echo ""
tput setaf 1
Expand Down
2 changes: 1 addition & 1 deletion installLibrealsense.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# MIT License

LIBREALSENSE_DIRECTORY=${HOME}/librealsense
LIBREALSENSE_VERSION=v2.17.1
LIBREALSENSE_VERSION=v2.29.0
INSTALL_DIR=$PWD


Expand Down
9 changes: 0 additions & 9 deletions patches/realsense-metadata-ubuntu-bionic-Xavier-4.9.140.patch
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,6 @@ diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 426fb245125a..e81e9cd53295 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -150,7 +150,7 @@
/* Maximum number of packets per URB. */
#define UVC_MAX_PACKETS 32
/* Maximum status buffer size in bytes of interrupt URB. */
-#define UVC_MAX_STATUS_SIZE 16
+#define UVC_MAX_STATUS_SIZE 32

#define UVC_CTRL_CONTROL_TIMEOUT 500
#define UVC_CTRL_STREAMING_TIMEOUT 5000
@@ -171,6 +171,7 @@
#define UVC_QUIRK_RESTRICT_FRAME_RATE 0x00000200
#define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400
Expand Down
4 changes: 2 additions & 2 deletions scripts/getKernelSourcesNoGUI.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ apt-add-repository universe
apt-get update
apt-get install pkg-config -y
cd /usr/src
wget -N https://developer.nvidia.com/embedded/dlc/l4t-sources-32-1-JAX-TX2
wget -N -O l4t-src.tbz2 https://developer.nvidia.com/embedded/dlc/r32-2-1_Release_v1.0/TX2-AGX/sources/public_sources.tbz2
# l4t-sources-32-1-0 is a tbz2 file
tar -xvf l4t-sources-32-1-JAX-TX2 public_sources/kernel_src.tbz2
tar -xvf l4t-src.tbz2
tar -xvf public_sources/kernel_src.tbz2
# Space is tight; get rid of the compressed kernel source
rm -r public_sources
Expand Down
4 changes: 2 additions & 2 deletions scripts/patchKernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ echo "kernel branch" $kernel_branch
kernel_name="kernel-4.9"


# For L4T 31.1.0 the kernel is 4.9.108 hence kernel-4.9
# For L4T 32.1.0 the kernel is 4.9.140 hence kernel-4.9

# Patches are available for kernel 4.4, 4.10 and 4.16
# For L4T 31.1.0, the kernel is 4.9
# For L4T 32.1.0, the kernel is 4.9
# Therefore we have to do a little dance; patches are modified versions of xenial 4.4 and 4.8 kernel patches

cd /usr/src/kernel/kernel-4.9
Expand Down