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>

BUILD.bazel

@@ -1,22 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-)
-
-filegroup(
-    name = "devicetree.scripts",
-    srcs = glob([
-        "scripts/**/*",
-    ]),
-)
-
-filegroup(
-    name = "generic-dts.srcs",
-    srcs = glob([
-        "generic-dts/**/*",
-    ]),
-)

generic-dts/Makefile

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2022-2024 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)
@@ -13,19 +13,15 @@ include $(oottree)/scripts/Makefile.lib
 
 DTC_CPP_FLAGS += $(EXTRA_CPP_FLAGS)
 
-DTC_CPP_FLAGS += -DLINUX_VERSION=600 -DTEGRA_HOST1X_DT_VERSION=2 -DOS_LINUX
+DTC_CPP_FLAGS += -DLINUX_VERSION=600 -DTEGRA_HOST1X_DT_VERSION=2
 
-ifdef CONFIG_TEGRA_SYSTEM_TYPE_ACK
-ifdef CONFIG_TEGRA_KLEAF_BUILD
-SOURCE_TOP := $(ROOT_DIR)
-else # !CONFIG_TEGRA_KLEAF_BUILD
+ifneq ($(findstring ack_src,$(NV_BUILD_KERNEL_OPTIONS)),)
 ifneq ($(TOP),)
 SOURCE_TOP := $(TOP)
 else
 $(error TOP is not defined)
 endif
-endif # end of CONFIG_TEGRA_KLEAF_BUILD
-else # !CONFIG_TEGRA_SYSTEM_TYPE_ACK
+else
 ifneq ($(TEGRA_TOP),)
 SOURCE_TOP := $(TEGRA_TOP)
 else ifneq ($(TOP),)
@@ -33,14 +29,10 @@ SOURCE_TOP := $(TOP)
 else
 $(error TEGRA_TOP or TOP is not defined)
 endif
-endif # end of CONFIG_TEGRA_SYSTEM_TYPE_ACK
-
-ifdef CONFIG_TEGRA_KLEAF_BUILD
-tegra-dtstree := $(SOURCE_TOP)/external/nvidia_dts/hardware/nvidia
-else
-tegra-dtstree := $(SOURCE_TOP)/hardware/nvidia
 endif
 
+tegra-dtstree := $(SOURCE_TOP)/hardware/nvidia
+
 # Get relative path for tegra-dtstree from this makefile
 null :=
 space :=$(null) $(null)
@@ -49,26 +41,17 @@ obj-path-from-top := $(subst $(SOURCE_TOP),,$(obj-path))
 rel-top-path := $(subst /, $(space)/,$(obj-path-from-top))
 rel-top-path := $(patsubst /%,../,$(rel-top-path))
 rel-top-path := $(subst $(space),,$(rel-top-path))
-ifdef CONFIG_TEGRA_KLEAF_BUILD
-tegra-rel-dtstree := $(rel-top-path)/external/nvidia_dts/hardware/nvidia
-else
 tegra-rel-dtstree := $(rel-top-path)/hardware/nvidia
-endif
 
 DTC_INCLUDE :=
 # SOC independent common include
 DTC_INCLUDE += $(tegra-dtstree)/tegra/nv-public
-DTC_INCLUDE += $(tegra-dtstree)/tegra/nv-public/include/kernel
-DTC_INCLUDE += $(tegra-dtstree)/tegra/nv-public/include/nvidia-oot
-DTC_INCLUDE += $(tegra-dtstree)/tegra/nv-public/include/platforms
 
 # SOC T23X specific common include
 DTC_INCLUDE += $(tegra-dtstree)/t23x/nv-public/include/kernel
 DTC_INCLUDE += $(tegra-dtstree)/t23x/nv-public/include/nvidia-oot
 DTC_INCLUDE += $(tegra-dtstree)/t23x/nv-public/include/platforms
 DTC_INCLUDE += $(tegra-dtstree)/t23x/nv-public
-DTC_INCLUDE += $(tegra-dtstree)/t264/nv-public/include/kernel-t264
-DTC_INCLUDE += $(tegra-dtstree)/t264/nv-public
 
 dtb-y :=
 dtbo-y :=
@@ -77,8 +60,20 @@ DTB_LIST := $(dtb-y)
 DTBO_LIST := $(dtbo-y)
 dtb-y :=
 fdts := $(tegra-dtstree)/t23x
-fdts += $(tegra-dtstree)/t264
+
+# 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)
 
@@ -144,14 +139,8 @@ dtbs: $(DTB_OBJS) $(DTBO_OBJS) FORCE
 	if [ ! -z "$(DTBS_DTBOS)" ] ; then \
 		cp -u $(DTB_OBJS) $(DTBO_OBJS) $(obj)/dtbs/ ; \
 	fi
-ifdef CONFIG_TEGRA_KLEAF_BUILD
-	if [ -d $(obj)/external/nvidia_dts/hardware/ ] ; then \
-		rm -rf $(obj)/external/nvidia_dts/hardware/ ; \
-	fi
-else
 	if [ -d $(obj)/hardware/ ] ; then \
 		rm -rf $(obj)/hardware/ ; \
 	fi
-endif
 
 clean-files := *.dtb *.dtbo *.tmp

legacy-dts/Makefile

@@ -17,7 +17,7 @@ DTC_FLAGS += -Wno-graph_endpoint
 
 DTC_CPP_FLAGS += $(EXTRA_CPP_FLAGS)
 
-DTC_CPP_FLAGS += -DLINUX_VERSION=600 -DTEGRA_HOST1X_DT_VERSION=2 -DOS_LINUX
+DTC_CPP_FLAGS += -DLINUX_VERSION=600 -DTEGRA_HOST1X_DT_VERSION=2
 
 ifneq ($(findstring ack_src,$(NV_BUILD_KERNEL_OPTIONS)),)
 ifneq ($(TOP),)
@@ -63,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)