[PATCH 11/15] arm: dts: k3-j721e-binman: Allow a single board configuration

3 Nov 2023

Allow the reuse of k3-j721e-binman for other platforms such as
BeagleBone-AI64. We don't need to build SK device tree blobs in-order
to be able to build dtbs for single configuration platforms.
Signed-off-by: Nishanth Menon nm@ti.com
---
 arch/arm/dts/k3-j721e-binman.dtsi             | 21 ++++++++++++++++++-
 .../k3-j721e-common-proc-board-u-boot.dtsi    |  2 ++
 arch/arm/dts/k3-j721e-sk-u-boot.dtsi          |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/k3-j721e-binman.dtsi b/arch/arm/dts/k3-j721e-binman.dtsi
index 4f566c21a9af..d9c4fbf593af 100644
--- a/arch/arm/dts/k3-j721e-binman.dtsi
+++ b/arch/arm/dts/k3-j721e-binman.dtsi
@@ -296,11 +296,14 @@
#define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
 #define SPL_J721E_EVM_DTB "spl/dts/k3-j721e-common-proc-board.dtb"
-#define SPL_J721E_SK_DTB "spl/dts/k3-j721e-sk.dtb"
#define UBOOT_NODTB "u-boot-nodtb.bin"
 #define J721E_EVM_DTB "u-boot.dtb"
+
+#ifdef DUAL_DTB_BINMAN
+#define SPL_J721E_SK_DTB "spl/dts/k3-j721e-sk.dtb"
 #define J721E_SK_DTB "arch/arm/dts/k3-j721e-sk.dtb"
+#endif
&binman {
    ti-dm {
@@ -400,6 +403,7 @@
    				};
    			};
+#ifdef DUAL_DTB_BINMAN
    			fdt-1 {
    				description = "k3-j721e-sk";
    				type = "flat_dt";
@@ -414,6 +418,7 @@
    					filename = SPL_J721E_SK_DTB;
    				};
    			};
+#endif
    		};
configurations {
@@ -426,12 +431,14 @@
    				fdt = "fdt-0";
    			};
+#ifdef DUAL_DTB_BINMAN
    			conf-1 {
    				description = "k3-j721e-sk";
    				firmware = "atf";
    				loadables = "tee", "dm", "spl";
    				fdt = "fdt-1";
    			};
+#endif
    		};
    	};
    };
@@ -482,6 +489,7 @@
    				};
    			};
+#ifdef DUAL_DTB_BINMAN
    			fdt-1 {
    				description = "k3-j721e-sk";
    				type = "flat_dt";
@@ -499,6 +507,7 @@
    					algo = "crc32";
    				};
    			};
+#endif
    		};
configurations {
@@ -511,12 +520,14 @@
    				fdt = "fdt-0";
    			};
+#ifdef DUAL_DTB_BINMAN
    			conf-1 {
    				description = "k3-j721e-sk";
    				firmware = "uboot";
    				loadables = "uboot";
    				fdt = "fdt-1";
    			};
+#endif
    		};
    	};
    };
@@ -595,6 +606,7 @@
    				};
    			};
+#ifdef DUAL_DTB_BINMAN
    			fdt-1 {
    				description = "k3-j721e-sk";
    				type = "flat_dt";
@@ -604,6 +616,7 @@
    					filename = SPL_J721E_SK_DTB;
    				};
    			};
+#endif
    		};
configurations {
@@ -616,12 +629,14 @@
    				fdt = "fdt-0";
    			};
+#ifdef DUAL_DTB_BINMAN
    			conf-1 {
    				description = "k3-j721e-sk";
    				firmware = "atf";
    				loadables = "tee", "dm", "spl";
    				fdt = "fdt-1";
    			};
+#endif
    		};
    	};
    };
@@ -664,6 +679,7 @@
    				};
    			};
+#ifdef DUAL_DTB_BINMAN
    			fdt-1 {
    				description = "k3-j721e-sk";
    				type = "flat_dt";
@@ -676,6 +692,7 @@
    					algo = "crc32";
    				};
    			};
+#endif
    		};
configurations {
@@ -688,12 +705,14 @@
    				fdt = "fdt-0";
    			};
+#ifdef DUAL_DTB_BINMAN
    			conf-1 {
    				description = "k3-j721e-sk";
    				firmware = "uboot";
    				loadables = "uboot";
    				fdt = "fdt-1";
    			};
+#endif
    		};
    	};
    };
diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
index cd95907b981b..3317e902d677 100644
--- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
@@ -3,6 +3,8 @@
  * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
  */
+#define DUAL_DTB_BINMAN 1
+
 #include "k3-j721e-binman.dtsi"
&cbass_main {
diff --git a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
index 370fe5190b2d..507964827547 100644
--- a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
@@ -3,6 +3,8 @@
  * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
  */
+#define DUAL_DTB_BINMAN 1
+
 #include "k3-j721e-binman.dtsi"
&cbass_main {
-- 
2.40.0


    