[PATCH 15/18] k3-*-binman: dts: Pack u-boot.dtb instead of soc specific dtb
Manorit Chawdhry
m-chawdhry at ti.com
Fri Jul 14 07:52:38 CEST 2023
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 at ti.com>
[ add additional boards that were missing ]
Signed-off-by: Kamlesh Gurudasani <kamlesh at ti.com>
---
arch/arm/dts/k3-am625-sk-binman.dtsi | 2 +-
arch/arm/dts/k3-am62a-sk-binman.dtsi | 2 +-
arch/arm/dts/k3-am64x-binman.dtsi | 2 +-
arch/arm/dts/k3-am65x-binman.dtsi | 2 +-
arch/arm/dts/k3-j7200-binman.dtsi | 2 +-
arch/arm/dts/k3-j721e-binman.dtsi | 2 +-
arch/arm/dts/k3-j721s2-binman.dtsi | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/k3-am625-sk-binman.dtsi b/arch/arm/dts/k3-am625-sk-binman.dtsi
index c5bd9e48d060..8efba572addb 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 abbac8f08481..eb1f7a929fa9 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 e6ca2457b47d..24f562aafd79 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 6535b9fec2cc..90ea220a2f6c 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 61bf5769701b..2a1be4a9e09d 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 0455deb6ca8a..48a21e838b06 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 7fd7ba8e5d79..6a157ff0ee3d 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 {
--
2.40.1
More information about the U-Boot
mailing list