[PATCH v6 09/11] xilinx: Disable CONFIG_BOOTSTD_DEFAULTS for some xilinx boards

[Mark Kettenis]

> From: Simon Glass <sjg at chromium.org>
> Date: Sun,  2 Apr 2023 09:45:33 +1200
> 
> Since CONFIG_BOOTSTD_DEFAULTS now selects ENV_VARS_UBOOT_CONFIG we cannot
> enable it for some Xilinx boards which have a very small environment.
> 
> Disable it.

Does that mean these configs lose distroboot support?  That would be a
shame!

> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
> Changes in v6:
> - Add new patch to disable CONFIG_BOOTSTD_DEFAULTS for some xilinx boards
> 
>  configs/xilinx_versal_mini_emmc0_defconfig | 1 +
>  configs/xilinx_versal_mini_emmc1_defconfig | 1 +
>  configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 +
>  configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 +
>  4 files changed, 4 insertions(+)
> 
> diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig
> index 31b3c02f7389..8aadc7f6805b 100644
> --- a/configs/xilinx_versal_mini_emmc0_defconfig
> +++ b/configs/xilinx_versal_mini_emmc0_defconfig
> @@ -16,6 +16,7 @@ CONFIG_SYS_PROMPT="Versal> "
>  CONFIG_SYS_LOAD_ADDR=0x8000000
>  # CONFIG_EXPERT is not set
>  CONFIG_REMAKE_ELF=y
> +# CONFIG_BOOTSTD_DEFAULTS is not set
>  # CONFIG_AUTOBOOT is not set
>  CONFIG_USE_BOOTCOMMAND=y
>  CONFIG_BOOTCOMMAND="run distro_bootcmd"
> diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig
> index 5480cf1d9cc4..5ccc20048212 100644
> --- a/configs/xilinx_versal_mini_emmc1_defconfig
> +++ b/configs/xilinx_versal_mini_emmc1_defconfig
> @@ -16,6 +16,7 @@ CONFIG_SYS_PROMPT="Versal> "
>  CONFIG_SYS_LOAD_ADDR=0x8000000
>  # CONFIG_EXPERT is not set
>  CONFIG_REMAKE_ELF=y
> +# CONFIG_BOOTSTD_DEFAULTS is not set
>  # CONFIG_AUTOBOOT is not set
>  CONFIG_USE_BOOTCOMMAND=y
>  CONFIG_BOOTCOMMAND="run distro_bootcmd"
> diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig
> index cf7c7eda8c94..47eab450c90a 100644
> --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig
> +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig
> @@ -17,6 +17,7 @@ CONFIG_SYS_LOAD_ADDR=0x8000000
>  CONFIG_REMAKE_ELF=y
>  # CONFIG_MP is not set
>  CONFIG_FIT=y
> +# CONFIG_BOOTSTD_DEFAULTS is not set
>  CONFIG_SUPPORT_RAW_INITRD=y
>  # CONFIG_AUTOBOOT is not set
>  # CONFIG_DISPLAY_CPUINFO is not set
> diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig
> index a4a43b58a85e..da1e2d699caa 100644
> --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig
> +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig
> @@ -18,6 +18,7 @@ CONFIG_REMAKE_ELF=y
>  # CONFIG_MP is not set
>  CONFIG_FIT=y
>  CONFIG_SUPPORT_RAW_INITRD=y
> +# CONFIG_BOOTSTD_DEFAULTS is not set
>  # CONFIG_AUTOBOOT is not set
>  # CONFIG_DISPLAY_CPUINFO is not set
>  CONFIG_BOARD_EARLY_INIT_R=y
> -- 
> 2.40.0.348.gf938b09366-goog
> 
>