From 6263a5978ea1dd307b190b3490627a822de60a3a Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Mon, 14 Nov 2022 16:09:22 +0000
Subject: [PATCH] generic-dts: Move overlay files to overlay folder

Remove the "-overlay" from file name and move all overlay
files to the overlay folder. This way, base and overlay will
be differentiate based on folder at source level and based
on extension on binary level.

Bug 3523182

Change-Id: I361877cea630be216cd22390daf8a7da8605c5e3
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/platform/t23x/concord-generic-dts/+/2808882
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 Makefile => overlay/Makefile                           | 10 +++++-----
 .../tegra234-carveouts.dts                             |  0
 .../tegra234-dcb-p3737-0000-p3701-0000.dtsi            |  0
 .../tegra234-jetson.dts                                |  0
 .../tegra234-p3701-0000.dtsi                           |  0
 .../tegra234-p3737-0000+p3701-0000.dts                 |  4 ++--
 .../tegra234-p3737-0000.dtsi                           |  0
 .../tegra234-sbsa-uart.dts                             |  0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename Makefile => overlay/Makefile (52%)
 rename tegra234-carveouts-overlay.dts => overlay/tegra234-carveouts.dts (100%)
 rename tegra234-dcb-p3737-0000-p3701-0000.dtsi => overlay/tegra234-dcb-p3737-0000-p3701-0000.dtsi (100%)
 rename tegra234-jetson-overlay.dts => overlay/tegra234-jetson.dts (100%)
 rename tegra234-p3701-0000-overlay.dtsi => overlay/tegra234-p3701-0000.dtsi (100%)
 rename tegra234-p3737-0000+p3701-0000-overlay.dts => overlay/tegra234-p3737-0000+p3701-0000.dts (98%)
 rename tegra234-p3737-0000-overlay.dtsi => overlay/tegra234-p3737-0000.dtsi (100%)
 rename tegra234-sbsa-uart-overlay.dts => overlay/tegra234-sbsa-uart.dts (100%)

diff --git a/Makefile b/overlay/Makefile
similarity index 52%
rename from Makefile
rename to overlay/Makefile
index fc39150..5d924fe 100644
--- a/Makefile
+++ b/overlay/Makefile
@@ -2,12 +2,12 @@ old-dtb := $(dtb-y)
 old-dtbo := $(dtbo-y)
 dtb-y :=
 dtbo-y :=
-makefile-path := platform/t23x/concord/dts/generic-dts
+makefile-path := platform/t23x/concord/dts/generic-dts/overlay
 
-dtbo-y += tegra234-p3737-0000+p3701-0000-overlay.dtbo
-dtbo-y += tegra234-jetson-overlay.dtbo
-dtbo-y += tegra234-carveouts-overlay.dtbo
-dtbo-y += tegra234-sbsa-uart-overlay.dtbo
+dtbo-y += tegra234-p3737-0000+p3701-0000.dtbo
+dtbo-y += tegra234-jetson.dtbo
+dtbo-y += tegra234-carveouts.dtbo
+dtbo-y += tegra234-sbsa-uart.dtbo
 
 ifneq ($(dtb-y),)
 dtb-y := $(addprefix $(makefile-path)/,$(dtb-y))
diff --git a/tegra234-carveouts-overlay.dts b/overlay/tegra234-carveouts.dts
similarity index 100%
rename from tegra234-carveouts-overlay.dts
rename to overlay/tegra234-carveouts.dts
diff --git a/tegra234-dcb-p3737-0000-p3701-0000.dtsi b/overlay/tegra234-dcb-p3737-0000-p3701-0000.dtsi
similarity index 100%
rename from tegra234-dcb-p3737-0000-p3701-0000.dtsi
rename to overlay/tegra234-dcb-p3737-0000-p3701-0000.dtsi
diff --git a/tegra234-jetson-overlay.dts b/overlay/tegra234-jetson.dts
similarity index 100%
rename from tegra234-jetson-overlay.dts
rename to overlay/tegra234-jetson.dts
diff --git a/tegra234-p3701-0000-overlay.dtsi b/overlay/tegra234-p3701-0000.dtsi
similarity index 100%
rename from tegra234-p3701-0000-overlay.dtsi
rename to overlay/tegra234-p3701-0000.dtsi
diff --git a/tegra234-p3737-0000+p3701-0000-overlay.dts b/overlay/tegra234-p3737-0000+p3701-0000.dts
similarity index 98%
rename from tegra234-p3737-0000+p3701-0000-overlay.dts
rename to overlay/tegra234-p3737-0000+p3701-0000.dts
index 94de010..2252414 100644
--- a/tegra234-p3737-0000+p3701-0000-overlay.dts
+++ b/overlay/tegra234-p3737-0000+p3701-0000.dts
@@ -6,8 +6,8 @@
 /plugin/;
 
 #include "overlay/tegra234-soc-overlay.dtsi"
-#include "tegra234-p3737-0000-overlay.dtsi"
-#include "tegra234-p3701-0000-overlay.dtsi"
+#include "tegra234-p3737-0000.dtsi"
+#include "tegra234-p3701-0000.dtsi"
 #include "overlay/tegra234-audio-dai-links-overlay.dtsi"
 #include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
 
diff --git a/tegra234-p3737-0000-overlay.dtsi b/overlay/tegra234-p3737-0000.dtsi
similarity index 100%
rename from tegra234-p3737-0000-overlay.dtsi
rename to overlay/tegra234-p3737-0000.dtsi
diff --git a/tegra234-sbsa-uart-overlay.dts b/overlay/tegra234-sbsa-uart.dts
similarity index 100%
rename from tegra234-sbsa-uart-overlay.dts
rename to overlay/tegra234-sbsa-uart.dts