From: Manorit Chawdhry <m-chawdhry@ti.com>
Date: Fri, 14 Jul 2023 05:52:38 +0000 (+0530)
Subject: k3-*-binman: dts: Pack u-boot.dtb instead of soc specific dtb
X-Git-Tag: v2023.10-rc1~7^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=175535758aadebeccb47aeac7553fdba44f105f4;p=pandora-u-boot.git

k3-*-binman: dts: Pack u-boot.dtb instead of soc specific dtb

FIT signature requires the updates to u-boot.dtb and the DTB that we
pack don't get updates with the changes of the signature node.

Pack u-boot.dtb as the default DTB so that the signature node changes
can be reflected in them.

(Note, this is only packaging the primary platform and the secondary
 platform will require manual changes for the FIT signature enablement)

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
[ add additional boards that were missing ]
Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/arm/dts/k3-am625-sk-binman.dtsi b/arch/arm/dts/k3-am625-sk-binman.dtsi
index b468d959b54..a35d6418c25 100644
--- a/arch/arm/dts/k3-am625-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am625-sk-binman.dtsi
@@ -145,7 +145,7 @@
 #define SPL_AM625_SK_DTB "spl/dts/k3-am625-sk.dtb"
 
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define AM625_SK_DTB "arch/arm/dts/k3-am625-sk.dtb"
+#define AM625_SK_DTB "u-boot.dtb"
 
 &binman {
 	ti-dm {
diff --git a/arch/arm/dts/k3-am62a-sk-binman.dtsi b/arch/arm/dts/k3-am62a-sk-binman.dtsi
index a79d3f1127a..de09430d936 100644
--- a/arch/arm/dts/k3-am62a-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am62a-sk-binman.dtsi
@@ -148,7 +148,7 @@
 #define SPL_AM62A7_SK_DTB "spl/dts/k3-am62a7-sk.dtb"
 
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define AM62A7_SK_DTB "arch/arm/dts/k3-am62a7-sk.dtb"
+#define AM62A7_SK_DTB "u-boot.dtb"
 
 &binman {
 	ti-dm {
diff --git a/arch/arm/dts/k3-am64x-binman.dtsi b/arch/arm/dts/k3-am64x-binman.dtsi
index 26e17bddf3d..a5e54006b44 100644
--- a/arch/arm/dts/k3-am64x-binman.dtsi
+++ b/arch/arm/dts/k3-am64x-binman.dtsi
@@ -123,7 +123,7 @@
 #define SPL_AM642_SK_DTB "spl/dts/k3-am642-sk.dtb"
 
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define AM642_EVM_DTB "arch/arm/dts/k3-am642-evm.dtb"
+#define AM642_EVM_DTB "u-boot.dtb"
 #define AM642_SK_DTB "arch/arm/dts/k3-am642-sk.dtb"
 
 &binman {
diff --git a/arch/arm/dts/k3-am65x-binman.dtsi b/arch/arm/dts/k3-am65x-binman.dtsi
index 4bf08451b48..59605ca597b 100644
--- a/arch/arm/dts/k3-am65x-binman.dtsi
+++ b/arch/arm/dts/k3-am65x-binman.dtsi
@@ -210,7 +210,7 @@
 #define SPL_AM654_EVM_DTB "spl/dts/k3-am654-base-board.dtb"
 
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define AM654_EVM_DTB "arch/arm/dts/k3-am654-base-board.dtb"
+#define AM654_EVM_DTB "u-boot.dtb"
 
 &binman {
 	ti-spl {
diff --git a/arch/arm/dts/k3-j7200-binman.dtsi b/arch/arm/dts/k3-j7200-binman.dtsi
index 613aca59504..14f7dea65ee 100644
--- a/arch/arm/dts/k3-j7200-binman.dtsi
+++ b/arch/arm/dts/k3-j7200-binman.dtsi
@@ -184,7 +184,7 @@
 #define SPL_J7200_EVM_DTB "spl/dts/k3-j7200-common-proc-board.dtb"
 
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define J7200_EVM_DTB "arch/arm/dts/k3-j7200-common-proc-board.dtb"
+#define J7200_EVM_DTB "u-boot.dtb"
 
 &binman {
 	ti-dm {
diff --git a/arch/arm/dts/k3-j721e-binman.dtsi b/arch/arm/dts/k3-j721e-binman.dtsi
index 7fb63d62333..4f566c21a9a 100644
--- a/arch/arm/dts/k3-j721e-binman.dtsi
+++ b/arch/arm/dts/k3-j721e-binman.dtsi
@@ -299,7 +299,7 @@
 #define SPL_J721E_SK_DTB "spl/dts/k3-j721e-sk.dtb"
 
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define J721E_EVM_DTB "arch/arm/dts/k3-j721e-common-proc-board.dtb"
+#define J721E_EVM_DTB "u-boot.dtb"
 #define J721E_SK_DTB "arch/arm/dts/k3-j721e-sk.dtb"
 
 &binman {
diff --git a/arch/arm/dts/k3-j721s2-binman.dtsi b/arch/arm/dts/k3-j721s2-binman.dtsi
index 1671217ec05..5bca4e94ecf 100644
--- a/arch/arm/dts/k3-j721s2-binman.dtsi
+++ b/arch/arm/dts/k3-j721s2-binman.dtsi
@@ -146,7 +146,7 @@
 #define SPL_AM68_SK_DTB "spl/dts/k3-am68-sk-base-board.dtb"
 
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define J721S2_EVM_DTB "arch/arm/dts/k3-j721s2-common-proc-board.dtb"
+#define J721S2_EVM_DTB "u-boot.dtb"
 #define AM68_SK_DTB "arch/arm/dts/k3-am68-sk-base-board.dtb"
 
 &binman {