From 3052d420c3f1bbaa063ff2cdc75cca4f4aeb5a47 Mon Sep 17 00:00:00 2001 From: Ashish Mhetre Date: Tue, 10 Jan 2023 06:25:29 +0000 Subject: [PATCH] device-tree: generic-dts: Set correct LINUX_VERSION For generic-dts, LINUX_VERSION is hardcoded to be 5.15. This is used by kstable as well where kernel version is 6.0. Fix this by setting appropriate LINUX_VERSION based on kernel build options. Bug 3931063 Change-Id: I478ce03b40ff57b9839ae9d3168825b3c917196b Signed-off-by: Ashish Mhetre Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2840518 Reviewed-by: Bitan Biswas Reviewed-by: Sachin Nikam GVS: Gerrit_Virtual_Submit --- generic-dts/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/generic-dts/Makefile b/generic-dts/Makefile index b8b915a..74cdc9c 100644 --- a/generic-dts/Makefile +++ b/generic-dts/Makefile @@ -13,7 +13,11 @@ include $(oottree)/scripts/Makefile.lib DTC_CPP_FLAGS += $(EXTRA_CPP_FLAGS) +ifneq ($(findstring oot,$(NV_BUILD_KERNEL_OPTIONS)),) DTC_CPP_FLAGS += -DLINUX_VERSION=515 -DTEGRA_HOST1X_DT_VERSION=2 +else +DTC_CPP_FLAGS += -DLINUX_VERSION=600 -DTEGRA_HOST1X_DT_VERSION=2 +endif ifneq ($(TEGRA_TOP),) SOURCE_TOP := $(TEGRA_TOP)