[PATCH v2 3/7] arm64: zynqmp: Describe empty binman node

Simon Glass sjg at chromium.org
Fri Dec 6 20:19:45 CET 2024


On Fri, 1 Nov 2024 at 03:18, Michal Simek <michal.simek at amd.com> wrote:
>
> For enabling binman by default there is a need to have at least empty node
> present that's why create -u-boot.dtsi with empty node to cover all ZynqMP
> platforms.
>
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> ---
>
> Changes in v2:
> - new patch
>
>  arch/arm/dts/Makefile                            |  1 +
>  arch/arm/dts/zynqmp-binman-mini.dts              | 10 ++++++++++
>  arch/arm/dts/zynqmp-u-boot.dtsi                  | 11 +++++++++++
>  configs/xilinx_zynqmp_mini_defconfig             |  2 ++
>  configs/xilinx_zynqmp_mini_emmc0_defconfig       |  3 +++
>  configs/xilinx_zynqmp_mini_emmc1_defconfig       |  3 +++
>  configs/xilinx_zynqmp_mini_nand_defconfig        |  2 ++
>  configs/xilinx_zynqmp_mini_nand_single_defconfig |  2 ++
>  configs/xilinx_zynqmp_mini_qspi_defconfig        |  3 +++
>  9 files changed, 37 insertions(+)
>  create mode 100644 arch/arm/dts/zynqmp-binman-mini.dts
>  create mode 100644 arch/arm/dts/zynqmp-u-boot.dtsi
>

Reviewed-by: Simon Glass <sjg at chromium.org>



> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index aeccfa93fc53..253d883d6156 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -274,6 +274,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \
>         zynqmp-mini-qspi-x1-stacked.dtb         \
>         zynqmp-mini-qspi-x2-single.dtb          \
>         zynqmp-mini-qspi-x2-stacked.dtb         \
> +       zynqmp-binman-mini.dtb                  \
>         zynqmp-sc-revB.dtb                      \
>         zynqmp-sc-revC.dtb                      \
>         zynqmp-sm-k24-revA.dtb                  \
> diff --git a/arch/arm/dts/zynqmp-binman-mini.dts b/arch/arm/dts/zynqmp-binman-mini.dts
> new file mode 100644
> index 000000000000..8f3d18ef394b
> --- /dev/null
> +++ b/arch/arm/dts/zynqmp-binman-mini.dts
> @@ -0,0 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * (C) Copyright 2024, Advanced Micro Devices, Inc.
> + *
> + * Michal Simek <michal.simek at amd.com>
> + */
> +
> +/dts-v1/;
> +
> +#include "zynqmp-u-boot.dtsi"
> diff --git a/arch/arm/dts/zynqmp-u-boot.dtsi b/arch/arm/dts/zynqmp-u-boot.dtsi
> new file mode 100644
> index 000000000000..9a7527ed5a10
> --- /dev/null
> +++ b/arch/arm/dts/zynqmp-u-boot.dtsi
> @@ -0,0 +1,11 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * (C) Copyright 2024, Advanced Micro Devices, Inc.
> + *
> + * Michal Simek <michal.simek at amd.com>
> + */
> +
> +/ {
> +       binman: binman {
> +       };
> +};
> diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig
> index 7aab69c9e46b..f0af27bbd4e6 100644
> --- a/configs/xilinx_zynqmp_mini_defconfig
> +++ b/configs/xilinx_zynqmp_mini_defconfig
> @@ -59,6 +59,8 @@ CONFIG_NO_NET=y
>  # CONFIG_DM_MAILBOX is not set
>  # CONFIG_MMC is not set
>  CONFIG_ARM_DCC=y
> +# CONFIG_BINMAN_FDT is not set
> +CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman-mini.dtb"
>  CONFIG_PANIC_HANG=y
>  # CONFIG_GZIP is not set
>  # CONFIG_LMB is not set
> diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig
> index c56b1e830d67..9b3ab06f7c00 100644
> --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig
> +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig
> @@ -28,6 +28,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>  # CONFIG_BOARD_LATE_INIT is not set
>  CONFIG_CLOCKS=y
>  CONFIG_SPL_MAX_SIZE=0x40000
> +# CONFIG_SPL_BINMAN_SYMBOLS is not set
>  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>  CONFIG_SPL_SYS_MALLOC=y
>  CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
> @@ -73,6 +74,8 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
>  CONFIG_ARM_DCC=y
> +# CONFIG_BINMAN_FDT is not set
> +CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman-mini.dtb"
>  CONFIG_PANIC_HANG=y
>  # CONFIG_GZIP is not set
>  # CONFIG_LMB is not set
> diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig
> index a8dbf0056da3..3b088c5002a7 100644
> --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig
> +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig
> @@ -28,6 +28,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>  # CONFIG_BOARD_LATE_INIT is not set
>  CONFIG_CLOCKS=y
>  CONFIG_SPL_MAX_SIZE=0x40000
> +# CONFIG_SPL_BINMAN_SYMBOLS is not set
>  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>  CONFIG_SPL_SYS_MALLOC=y
>  CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
> @@ -73,6 +74,8 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_MMC_SDHCI=y
>  CONFIG_MMC_SDHCI_ZYNQ=y
>  CONFIG_ARM_DCC=y
> +# CONFIG_BINMAN_FDT is not set
> +CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman-mini.dtb"
>  CONFIG_PANIC_HANG=y
>  # CONFIG_GZIP is not set
>  # CONFIG_LMB is not set
> diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig
> index ba8f02c5b11d..83bd3c9a5345 100644
> --- a/configs/xilinx_zynqmp_mini_nand_defconfig
> +++ b/configs/xilinx_zynqmp_mini_nand_defconfig
> @@ -59,6 +59,8 @@ CONFIG_NAND_ARASAN=y
>  CONFIG_SYS_NAND_ONFI_DETECTION=y
>  CONFIG_SYS_NAND_MAX_CHIPS=2
>  CONFIG_ARM_DCC=y
> +# CONFIG_BINMAN_FDT is not set
> +CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman-mini.dtb"
>  CONFIG_PANIC_HANG=y
>  # CONFIG_GZIP is not set
>  # CONFIG_LMB is not set
> diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig
> index a8a0055f2e5b..fea0c6e08415 100644
> --- a/configs/xilinx_zynqmp_mini_nand_single_defconfig
> +++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig
> @@ -58,6 +58,8 @@ CONFIG_MTD_RAW_NAND=y
>  CONFIG_NAND_ARASAN=y
>  CONFIG_SYS_NAND_ONFI_DETECTION=y
>  CONFIG_ARM_DCC=y
> +# CONFIG_BINMAN_FDT is not set
> +CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman-mini.dtb"
>  CONFIG_PANIC_HANG=y
>  # CONFIG_GZIP is not set
>  # CONFIG_LMB is not set
> diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
> index c08b10c6944f..39e50ff8c4f8 100644
> --- a/configs/xilinx_zynqmp_mini_qspi_defconfig
> +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
> @@ -31,6 +31,7 @@ CONFIG_LOGLEVEL=0
>  # CONFIG_BOARD_LATE_INIT is not set
>  CONFIG_CLOCKS=y
>  CONFIG_SPL_MAX_SIZE=0x40000
> +# CONFIG_SPL_BINMAN_SYMBOLS is not set
>  # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>  CONFIG_SPL_SYS_MALLOC=y
>  CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y
> @@ -91,6 +92,8 @@ CONFIG_SPI_FLASH_WINBOND=y
>  CONFIG_ARM_DCC=y
>  CONFIG_SPI=y
>  CONFIG_ZYNQMP_GQSPI=y
> +# CONFIG_BINMAN_FDT is not set
> +CONFIG_BINMAN_DTB="./arch/arm/dts/zynqmp-binman-mini.dtb"
>  CONFIG_PANIC_HANG=y
>  # CONFIG_GZIP is not set
>  # CONFIG_LMB is not set
> --
> 2.43.0
>


More information about the U-Boot mailing list