feature/spiri-kernel-cti-jetpack-4.4.1 #1

Manually merged
dchvs merged 11 commits from feature/spiri-kernel-cti-jetpack-4.4.1 into master 2021-03-16 01:40:35 -03:00
3 changed files with 38 additions and 0 deletions
Showing only changes of commit 33956acd33 - Show all commits

View File

@ -4,6 +4,8 @@ KERNEL_OVERLAYS += $(CURDIR)/../nvidia
KERNEL_OVERLAYS += $(CURDIR)/../nvgpu
KERNEL_OVERLAYS += $(CURDIR)/../nvgpu-next
KERNEL_OVERLAYS += $(CURDIR)/../nvidia-t23x
LI_MT9M021_KERNEL_PATH=./li-mt9m021/kernel/nvidia-spiri
KERNEL_OVERLAYS += $(CURDIR)/../../$(LI_MT9M021_KERNEL_PATH)
else
override KERNEL_OVERLAYS := $(subst :, ,$(KERNEL_OVERLAYS))
endif

View File

@ -98,6 +98,41 @@ DTB_NEW_RULE_LIST := $(dtb-y)
DTBO_LIST += $(dtbo-y)
DTBO_NEW_RULE_LIST := $(dtbo-y)
######### Include RidgeRun
LI_MT9M021_PATH=$(tegra-rel-dtstree)/../source/li-mt9m021/hardware/nvidia-spiri
LI_MT9M021_MAKEFILE_PATH=$(tegra-dtstree)/../../li-mt9m021/hardware/nvidia-spiri/platform/
dtb-y :=
dts_makefile=$(foreach d,$(wildcard $1*), $(call dts_makefile,$(d)/,$(2)) $(if $(findstring Makefile,$(d)),$(d)))
dts_mfiles_d = $(call dts_makefile, $(LI_MT9M021_MAKEFILE_PATH), Makefile)
ifneq ($(dts_mfiles_d),)
dts-include :=
include $(dts_mfiles_d)
dtb-y := $(addprefix $(LI_MT9M021_PATH)/,$(dtb-y))
dtbo-y := $(addprefix $(LI_MT9M021_PATH)/,$(dtbo-y))
ifneq ($(dts-include),)
DTC_FLAGS += $(addprefix -i $(LI_MT9M021_PATH)/,$(dts-include))
DTCCPP_FLAGS += $(addprefix -I$(LI_MT9M021_PATH)/,$(dts-include))
DTC_FLAGS += -i $(LI_MT9M021_MAKEFILE_PATH)/../soc/t18x/kernel-include
DTC_FLAGS += -i $(LI_MT9M021_MAKEFILE_PATH)/../soc/t18x/kernel-dts
DTC_FLAGS += -i $(LI_MT9M021_MAKEFILE_PATH)/t18x/common/kernel-dts
DTC_FLAGS += -i $(LI_MT9M021_MAKEFILE_PATH)/t18x/quill/kernel-dts
DTCCPP_FLAGS += -I$(LI_MT9M021_MAKEFILE_PATH)/../soc/t18x/kernel-include
DTCCPP_FLAGS += -I$(LI_MT9M021_MAKEFILE_PATH)/../soc/t18x/kernel-dts
DTCCPP_FLAGS += -I$(LI_MT9M021_MAKEFILE_PATH)/t18x/common/kernel-dts
DTCCPP_FLAGS += -I$(LI_MT9M021_MAKEFILE_PATH)/t18x/quill/kernel-dts
endif
endif
DTB_LIST += $(dtb-y)
DTB_NEW_RULE_LIST += $(dtb-y)
DTBO_LIST += $(dtbo-y)
DTBO_NEW_RULE_LIST += $(dtbo-y)
# Now save DTB_LIST to dtb-y
dtb-y := $(DTB_LIST)
dtbo-y := $(DTBO_LIST)

View File

@ -1196,3 +1196,4 @@ CONFIG_IRQ_POLL=y
CONFIG_ARCH_TEGRA_18x_SOC=y
CONFIG_ARCH_TEGRA_19x_SOC=y
CONFIG_ARCH_TEGRA_23x_SOC=y
CONFIG_VIDEO_I2C_SPIRI_CAM=y