[PATCH 3/4] arm: dts: k3-*-binman.dtsi: Clean up and templatize boot binaries

[Andrew Davis]

On 3/22/24 8:10 AM, Neha Malcom Francis wrote:
> Clean up templatized boot binaries for all K3 boards. This includes
> modifying the k3-binman.dtsi to use SPL_BOARD_DTB, BOARD_DESCRIPTION and
> UBOOT_BOARD_DESCRIPTION from the files that include it to further reuse
> code.
> 
> All k3-<soc>-binman.dtsi will contain only templates. Only required boot
> binaries can be built from the templates in the boards' respective
> -u-boot.dtsi file (or k3-<board>-binman.dtsi if it exists). This allows
> clear distinction between the SoC common stuff vs. what is additionally
> needed to boot up a specific board.
> 
> Signed-off-by: Neha Malcom Francis <n-francis at ti.com>
> ---
>   arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi  | 161 +---------
>   arch/arm/dts/k3-am625-phycore-som-binman.dtsi | 291 +----------------
>   arch/arm/dts/k3-am625-r5-beagleplay.dts       |  39 ---
>   arch/arm/dts/k3-am625-sk-binman.dtsi          | 148 +--------
>   arch/arm/dts/k3-am625-sk-u-boot.dtsi          |  42 +++
>   .../dts/k3-am625-verdin-wifi-dev-binman.dtsi  | 296 +-----------------
>   arch/arm/dts/k3-am62a-sk-binman.dtsi          | 146 +--------
>   arch/arm/dts/k3-am62a7-sk-u-boot.dtsi         |  42 +++
>   arch/arm/dts/k3-am642-evm-u-boot.dtsi         |  42 +++
>   arch/arm/dts/k3-am642-sk-u-boot.dtsi          |  42 +++
>   arch/arm/dts/k3-am64x-binman.dtsi             | 239 +-------------
>   arch/arm/dts/k3-am654-base-board-u-boot.dtsi  |  49 +++
>   arch/arm/dts/k3-am65x-binman.dtsi             | 144 +--------
>   .../arm/dts/k3-am68-sk-base-board-u-boot.dtsi |  26 ++
>   arch/arm/dts/k3-am69-sk-u-boot.dtsi           |  31 +-
>   arch/arm/dts/k3-binman.dtsi                   |  96 ++++++
>   arch/arm/dts/k3-j7200-binman.dtsi             | 145 +--------
>   .../k3-j7200-common-proc-board-u-boot.dtsi    |  40 +++
>   .../dts/k3-j721e-beagleboneai64-u-boot.dtsi   | 154 +--------
>   arch/arm/dts/k3-j721e-binman.dtsi             | 262 +++-------------
>   .../k3-j721e-common-proc-board-u-boot.dtsi    |  84 +++++
>   arch/arm/dts/k3-j721e-r5-beagleboneai64.dts   |  91 +-----
>   arch/arm/dts/k3-j721e-sk-u-boot.dtsi          |  84 +++++
>   arch/arm/dts/k3-j721s2-binman.dtsi            | 231 +-------------
>   .../k3-j721s2-common-proc-board-u-boot.dtsi   |  42 +++
>   arch/arm/dts/k3-j784s4-binman.dtsi            | 154 +--------
>   arch/arm/dts/k3-j784s4-evm-u-boot.dtsi        |  42 +++
>   27 files changed, 858 insertions(+), 2305 deletions(-)
> 
> diff --git a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
> index cca0f44b7d8..fc1898f1510 100644
> --- a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
> +++ b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
> @@ -6,7 +6,11 @@
>    * Copyright (C) 2022-2023 Robert Nelson, BeagleBoard.org Foundation
>    */
>   
> -#include "k3-binman.dtsi"
> +#define SPL_BOARD_DTB "spl/dts/k3-am625-beagleplay.dtb"
> +#define BOARD_DESCRIPTION "k3-am625-beagleplay"
> +#define UBOOT_BOARD_DESCRIPTION "U-Boot for AM625 BeaglePlay"
> +
> +#include "k3-am625-sk-binman.dtsi"

Why is the BeaglePlay board including the SK binman file? Looks
like you made `k3-am625-sk-binman.dtsi` into the SoC general
file, which is good, but you should probably also rename it
here to match: `k3-am625-binman.dtsi`.

Andrew