device-tree: generic: Fix issue in use of objtree

Fix issue in building the DTBs when KERNEL_OUTPUT and KERNEL_HEADERS
are specified as different directories in the OOT modules' Makefile.
In that case, srctree is set to KERNEL_HEADERS and objtree is set to
KERNEL_OUTPUT, and device-tree Makefile should be able to handle the
case when srctree and objtree are specified as different directories.

Bug 4295120

Change-Id: I164288e957f791d8e8072926743d0a80e23da9cb
Signed-off-by: Paritosh Dixit <paritoshd@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3033099
Reviewed-by: svc-sw-mobile-l4t <svc-sw-mobile-l4t@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>

generic-dts/Makefile

@@ -1,7 +1,7 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: GPL-2.0-only
 
-objtree = $(srctree)
+objtree ?= $(srctree)
 
 # Redefine the fixdep command
 cmd_and_fixdep =                                                             \
@@ -13,12 +13,15 @@ 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 ($(findstring ack_src,$(NV_BUILD_KERNEL_OPTIONS)),)
+ifneq ($(TOP),)
+SOURCE_TOP := $(TOP)
+else
+$(error TOP is not defined)
+endif
+else
 ifneq ($(TEGRA_TOP),)
 SOURCE_TOP := $(TEGRA_TOP)
 else ifneq ($(TOP),)
@@ -26,6 +29,7 @@ SOURCE_TOP := $(TOP)
 else
 $(error TEGRA_TOP or TOP is not defined)
 endif
+endif
 
 tegra-dtstree := $(SOURCE_TOP)/hardware/nvidia
 
@@ -41,13 +45,13 @@ tegra-rel-dtstree := $(rel-top-path)/hardware/nvidia
 
 DTC_INCLUDE :=
 # SOC independent common include
-DTC_INCLUDE += $(tegra-dtstree)/soc/tegra/generic-dts/include
+DTC_INCLUDE += $(tegra-dtstree)/tegra/nv-public
 
 # SOC T23X specific common include
-DTC_INCLUDE += $(tegra-dtstree)/soc/generic-dts/tegra/include/kernel
+DTC_INCLUDE += $(tegra-dtstree)/t23x/nv-public/include/kernel
-DTC_INCLUDE += $(tegra-dtstree)/soc/generic-dts/tegra/include/nvidia-oot
+DTC_INCLUDE += $(tegra-dtstree)/t23x/nv-public/include/nvidia-oot
-DTC_INCLUDE += $(tegra-dtstree)/soc/generic-dts/t23x/include
+DTC_INCLUDE += $(tegra-dtstree)/t23x/nv-public/include/platforms
-DTC_INCLUDE += $(tegra-dtstree)/soc/generic-dts/t23x/dts
+DTC_INCLUDE += $(tegra-dtstree)/t23x/nv-public
 
 dtb-y :=
 dtbo-y :=
@@ -55,7 +59,21 @@ dtbo-y :=
 DTB_LIST := $(dtb-y)
 DTBO_LIST := $(dtbo-y)
 dtb-y :=
-kdts := $(shell find $(tegra-dtstree)/platform -name generic-dts)
+fdts := $(tegra-dtstree)/t23x
+
+# Add internal SOCs to scan the DT makefiles
+ifneq ($(internal_soc_list),)
+fdts += $(addprefix $(tegra-dtstree)/,$(internal_soc_list))
+endif
+
+# Remove the DTs from protected soc list
+ifneq ($(protected_soc_list),)
+kdts := $(foreach dt_path, $(fdts), $(if $(filter $(protected_soc_list),$(patsubst -,$(space),$(subst /, $(space),$(dt_path)))),,$(dt_path)))
+kdts := $(filter-out $(space)$(space),$(kdts))
+else
+kdts := $(fdts)
+endif
+
 dts_makefile=$(foreach d,$(wildcard $1*), $(call dts_makefile,$(d)/,$(2)) $(if $(findstring Makefile,$(d)),$(d)))
 dts_mfiles = $(call dts_makefile, $(kdts), Makefile)
 

legacy-dts/Makefile

@@ -11,10 +11,21 @@ cmd_and_fixdep =                                                             \
 
 include $(oottree)/scripts/Makefile.lib
 
+# Stop warning of the graph port and graph endpoint
+DTC_FLAGS += -Wno-graph_port
+DTC_FLAGS += -Wno-graph_endpoint
+
 DTC_CPP_FLAGS += $(EXTRA_CPP_FLAGS)
 
-DTC_CPP_FLAGS += -DLINUX_VERSION=515 -DTEGRA_HOST1X_DT_VERSION=2
+DTC_CPP_FLAGS += -DLINUX_VERSION=600 -DTEGRA_HOST1X_DT_VERSION=2
 
+ifneq ($(findstring ack_src,$(NV_BUILD_KERNEL_OPTIONS)),)
+ifneq ($(TOP),)
+SOURCE_TOP := $(TOP)
+else
+$(error TOP is not defined)
+endif
+else
 ifneq ($(TEGRA_TOP),)
 SOURCE_TOP := $(TEGRA_TOP)
 else ifneq ($(TOP),)
@@ -22,6 +33,7 @@ SOURCE_TOP := $(TOP)
 else
 $(error TEGRA_TOP or TOP is not defined)
 endif
+endif
 
 tegra-dtstree := $(SOURCE_TOP)/hardware/nvidia
 # Get relative path for tegra-dtstree from this makefile
@@ -51,7 +63,16 @@ dtbo-oot-y :=
 DTB_LIST := $(dtb-oot-y)
 DTBO_LIST := $(dtbo-oot-y)
 dtb-oot-y :=
-kdts := $(shell find $(tegra-dtstree)/platform -name kernel-dts)
+fdts := $(shell find $(tegra-dtstree)/platform -name kernel-dts)
+
+# Remove the DTs from protected soc list
+ifneq ($(protected_soc_list),)
+kdts := $(foreach dt_path, $(fdts), $(if $(filter $(protected_soc_list),$(patsubst -,$(space),$(subst /, $(space),$(dt_path)))),,$(dt_path)))
+kdts := $(filter-out $(space)$(space),$(kdts))
+else
+kdts := $(fdts)
+endif
+
 dts_makefile=$(foreach d,$(wildcard $1*), $(call dts_makefile,$(d)/,$(2)) $(if $(findstring Makefile,$(d)),$(d)))
 dts_mfiles = $(call dts_makefile, $(kdts), Makefile)