From 1fe432b1f85b0e7a9c6bc950856b1ec36d8c85ed Mon Sep 17 00:00:00 2001 From: Clyde McQueen Date: Mon, 28 Oct 2024 11:50:12 -0700 Subject: [PATCH 1/3] Build imx296 driver (experimental) --- .gitignore | 4 +++- .gitmodules | 3 +++ Makefile | 30 +++++++++++++++++++++++++++--- imx296 | 1 + 4 files changed, 34 insertions(+), 4 deletions(-) create mode 160000 imx296 diff --git a/.gitignore b/.gitignore index 8537cf5..6f16fb4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ Linux_for_Tegra/ out/ install.tar.bz2 -install/ \ No newline at end of file +install/ + +.idea/ diff --git a/.gitmodules b/.gitmodules index d82dd80..8b86799 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "nvidia-nvgpu"] url = https://nv-tegra.nvidia.com/r/linux-nvgpu.git path = nvidia-nvgpu +[submodule "imx296"] + path = imx296 + url = git@github.com:clydemcqueen/imx296.git diff --git a/Makefile b/Makefile index 643b2d0..b037dcb 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ MAKEFILE_DIR := $(abspath $(shell dirname $(lastword $(MAKEFILE_LIST)))) NVIDIA_CONFTEST ?= $(MAKEFILE_DIR)/out/nvidia-conftest -all: nvidia-nvgpu-modules nvidia-oot-modules vc-mipi-driver-modules -install: nvidia-modules-install vc-mipi-driver-modules-install +all: nvidia-nvgpu-modules nvidia-oot-modules vc-mipi-driver-modules rp-imx296-modules +install: nvidia-modules-install vc-mipi-driver-modules-install rp-imx296-modules-install # Build a tarball for installation on Nano package: @@ -28,6 +28,27 @@ vc-mipi-driver-modules-install: vc-mipi-driver-modules -C $(MAKEFILE_DIR)/vc-mipi-driver install +rp-imx296-modules: nvidia-oot-modules + $(MAKE) \ + KBUILD_EXTRA_SYMBOLS=$(MAKEFILE_DIR)/nvidia-oot/Module.symvers \ + CONFIG_TEGRA_OOT_MODULE=y \ + srctree.nvconftest=$(NVIDIA_CONFTEST) \ + srctree.nvidia-oot=$(MAKEFILE_DIR)/nvidia-oot \ + srctree.rp-imx296=$(MAKEFILE_DIR)/imx296 \ + M=$(MAKEFILE_DIR)/imx296 \ + -C $(KERNEL_SRC) + +rp-imx296-modules-install: rp-imx296-modules + $(MAKE) \ + KBUILD_EXTRA_SYMBOLS=$(MAKEFILE_DIR)/nvidia-oot/Module.symvers \ + CONFIG_TEGRA_OOT_MODULE=y \ + srctree.nvconftest=$(NVIDIA_CONFTEST) \ + srctree.nvidia-oot=$(MAKEFILE_DIR)/nvidia-oot \ + srctree.rp-imx296=$(MAKEFILE_DIR)/imx296 \ + KERNEL_SRC=$(KERNEL_SRC) \ + -C $(MAKEFILE_DIR)/imx296 install + + nvidia-oot-conftest: mkdir -p $(NVIDIA_CONFTEST)/nvidia; cp -av $(MAKEFILE_DIR)/nvidia-oot/scripts/conftest/* $(NVIDIA_CONFTEST)/nvidia @@ -110,4 +131,7 @@ clean: srctree.nvidia-oot=$(MAKEFILE_DIR)/nvidia-oot \ srctree.nvconftest=$(NVIDIA_CONFTEST) \ srctree.hwpm=$(MAKEFILE_DIR)/nvidia-hwpm \ - M=$(MAKEFILE_DIR)/nvidia-oot -C $(KERNEL_SRC) clean \ No newline at end of file + M=$(MAKEFILE_DIR)/nvidia-oot -C $(KERNEL_SRC) clean + $(MAKE) \ + srctree.rp-imx296=$(MAKEFILE_DIR)/imx296 \ + M=$(MAKEFILE_DIR)/imx296 -C $(KERNEL_SRC) clean diff --git a/imx296 b/imx296 new file mode 160000 index 0000000..3b915ec --- /dev/null +++ b/imx296 @@ -0,0 +1 @@ +Subproject commit 3b915ecfb8f26735d02abed7d876ffd01640b418 From 10e4d0a05ee06553be7c3ee94b03ec7173fa8561 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Wed, 30 Oct 2024 18:44:16 -0700 Subject: [PATCH 2/3] Updated imx296 to include WAG dtb, and first-cut install script. --- Makefile | 11 +++++++---- imx296 | 2 +- install.sh | 9 +++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100755 install.sh diff --git a/Makefile b/Makefile index b037dcb..12f921f 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,13 @@ MAKEFILE_DIR := $(abspath $(shell dirname $(lastword $(MAKEFILE_LIST)))) NVIDIA_CONFTEST ?= $(MAKEFILE_DIR)/out/nvidia-conftest all: nvidia-nvgpu-modules nvidia-oot-modules vc-mipi-driver-modules rp-imx296-modules -install: nvidia-modules-install vc-mipi-driver-modules-install rp-imx296-modules-install +install: nvidia-modules-install vc-mipi-driver-modules-install rp-imx296-modules-install # Build a tarball for installation on Nano -package: - sudo chown -R root:root $(INSTALL_MOD_PATH)/ - tar -C install -cjvf install.tar.bz2 lib/ boot/ +package: install + cp install.sh $(INSTALL_MOD_PATH)/ + chmod 755 $(INSTALL_MOD_PATH)/install.sh + tar -C $(INSTALL_MOD_PATH)/ -cjvf install.tar.bz2 lib/ boot/ install.sh vc-mipi-driver-modules: nvidia-oot-modules $(MAKE) -j $(NPROC) \ @@ -135,3 +136,5 @@ clean: $(MAKE) \ srctree.rp-imx296=$(MAKEFILE_DIR)/imx296 \ M=$(MAKEFILE_DIR)/imx296 -C $(KERNEL_SRC) clean + +.PHONY: clean package install all \ No newline at end of file diff --git a/imx296 b/imx296 index 3b915ec..595a649 160000 --- a/imx296 +++ b/imx296 @@ -1 +1 @@ -Subproject commit 3b915ecfb8f26735d02abed7d876ffd01640b418 +Subproject commit 595a64984efa09f87b85b558604daf3654196214 diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..f0bfabd --- /dev/null +++ b/install.sh @@ -0,0 +1,9 @@ +#!/usr/bin/sh +# +# Script which is added to install.tar.bz2 + +sudo chown -R root:root boot/ lib/ + +sudo install -o root -g root boot/* /boot +sudo install -o root -g root lib/modules/5.15.148-tegra/updates /lib/modules/5.15.148-tegra/ +sudo depmod -a From bc8da8f905298b98785161fb8fa6862652c5a5d5 Mon Sep 17 00:00:00 2001 From: Aaron Marburg Date: Fri, 1 Nov 2024 08:58:15 -0700 Subject: [PATCH 3/3] Remove local install.sh in prep for mergin from l4t-36.4.0/alpha --- install.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 install.sh diff --git a/install.sh b/install.sh deleted file mode 100755 index f0bfabd..0000000 --- a/install.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/sh -# -# Script which is added to install.tar.bz2 - -sudo chown -R root:root boot/ lib/ - -sudo install -o root -g root boot/* /boot -sudo install -o root -g root lib/modules/5.15.148-tegra/updates /lib/modules/5.15.148-tegra/ -sudo depmod -a