Skip to content

Commit

Permalink
Merge branch 'dual-jp6' into jp6-dual
Browse files Browse the repository at this point in the history
  • Loading branch information
Nir-Az authored Sep 2, 2024
2 parents 6f284d4 + 81c2304 commit 67d7bbb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
10 changes: 5 additions & 5 deletions README_JP5.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ sudo apt install build-essential bc flex bison
# build kernel, dtb and D457 driver
./build_all.sh 5.0.2 ./Linux_for_Tegra/source/public
```
Note: dev_dbg() log support will be enabled by default. If not needed, run the `./build_all.sh` script with `--no-dev-dbg` option like below.
Note: dev_dbg() log support will not be enabled by default. If needed, run the `./build_all.sh` script with `--dev-dbg` option like below.
```
./build_all.sh --no-dev-dbg 5.0.2 ./Linux_for_Tegra/source/public
./build_all.sh --dev-dbg 5.0.2 ./Linux_for_Tegra/source/public
```

</details>
Expand All @@ -95,9 +95,9 @@ The developers can set up the source code with NVIDIA's Jetson git repositories
./build_all.sh 5.0.2
```
Note: dev_dbg() log support will be enabled by default. If not needed, run the `./build_all.sh` script with `--no-dev-dbg` option like below.
Note: dev_dbg() log support will not be enabled by default. If needed, run the `./build_all.sh` script with `--dev-dbg` option like below.
```
./build_all.sh --no-dev-dbg 5.0.2
./build_all.sh --dev-dbg 5.0.2
```

## Install kernel, device-tree and D457 driver to Jetson AGX Xavier
Expand Down Expand Up @@ -177,4 +177,4 @@ After rebooting Jetson, the D457 driver should work.
**NOTE**
- It's recommended to save the original kernel image as backup boot option in `/boot/extlinux/extlinux.conf`.
- It's recommended to save the original kernel image as backup boot option in `/boot/extlinux/extlinux.conf`.
13 changes: 7 additions & 6 deletions README_JP6.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ cd realsense_mipi_platform_driver
./apply_patches.sh apply 6.0
./build_all.sh 6.0
```
Note: dev_dbg() log support will be enabled by default. If not needed, run the `./build_all.sh` script with `--no-dev-dbg` option like below.
Note: dev_dbg() log support will not be enabled by default. If needed, run the `./build_all.sh` script with `--dev-dbg` option like below.
```
./build_all.sh --no-dev-dbg 6.0
./build_all.sh --dev-dbg 6.0
```


Expand Down Expand Up @@ -84,13 +84,13 @@ cd ../..
# build kernel, dtb and D457 driver
./build_all.sh 6.0 ./Linux_for_Tegra/source
```
Note: dev_dbg() log support will be enabled by default. If not needed, run the `./build_all.sh` script with `--no-dev-dbg` option like below.
Note: dev_dbg() log support will not be enabled by default. If needed, run the `./build_all.sh` script with `--dev-dbg` option like below.
```
./build_all.sh --no-dev-dbg 6.0 ./Linux_for_Tegra/source
./build_all.sh --dev-dbg 6.0 ./Linux_for_Tegra/source
```

## Archive JetPack 6.0 build results (optional) on build host
- kernel image (not modified if `--no-dev-dbg` option is used while building): `images/6.0/rootfs/boot/Image`
- kernel image (modified if `--dev-dbg` option is used while building): `images/6.0/rootfs/boot/Image`
- dtb: `images/6.0/rootfs/boot/dtb/tegra234-p3737-0000+p3701-0000-nv.dtb`
- dtb overlay: `images/6.0/rootfs/boot/tegra234-camera-d4xx-overlay.dtbo`
- dtb dual camera overlay: `images/6.0/rootfs/boot/tegra234-camera-d4xx-overlay-dual.dtbo`
Expand Down Expand Up @@ -122,7 +122,7 @@ Following steps required:
3. Copy `tegra234-camera-d4xx-overlay.dtbo` from host to `/boot/tegra234-camera-d4xx-overlay.dtbo` on Orin target
4. For dual camera, copy `tegra234-camera-d4xx-overlay-dual.dtbo` from host to `/boot/tegra234-camera-d4xx-overlay-dual.dtbo` on Orin target
5. Copy `tegra234-p3737-0000+p3701-0000-nv.dtb` from host to `/boot/` on Orin
6. Copy `Image` from host to `/boot/` on Orin
6. Copy `Image` from host to `/boot/` on Orin (only if `--dev-dbg` option is enabled, else not needed as the kernel will be unmodified)
7. Run $ `sudo /opt/nvidia/jetson-io/jetson-io.py`
1. Configure Jetson AGX CSI Connector
2. Configure for compatible hardware
Expand Down Expand Up @@ -170,6 +170,7 @@ sudo cp -r ~/extra /lib/modules/$(uname -r)/
sudo cp -r ~/updates /lib/modules/$(uname -r)/
sudo cp ~/boot/tegra234-camera-d4xx-overlay.dtbo /boot/
sudo cp ./boot/dtb/tegra234-p3737-0000+p3701-0000-nv.dtb /boot/tegra234-p3737-0000+p3701-0000-nv.dtb
# If "--dev-dbg" option is enabled, kernel will be modified. So, copy the 'Image' as well. If not enabled, no need to copy.
sudo cp ./boot/Image /boot/Image
# Enable d4xx overlay for single camera:
sudo /opt/nvidia/jetson-io/config-by-hardware.py -n 2="Jetson RealSense Camera D457"
Expand Down
8 changes: 4 additions & 4 deletions build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
set -e

if [[ "$1" == "-h" ]]; then
echo "build_all.sh [--no-dev-dbg] [JetPack_version] [JetPack_Linux_source]"
echo "build_all.sh [--dev-dbg] [JetPack_version] [JetPack_Linux_source]"
echo "build_all.sh -h"
exit 1
fi

DEVDBG=1
if [[ "$1" == "--no-dev-dbg" ]]; then
DEVDBG=0
DEVDBG=0
if [[ "$1" == "--dev-dbg" ]]; then
DEVDBG=1
shift
fi

Expand Down

0 comments on commit 67d7bbb

Please sign in to comment.