[PATCH] arm64: zynqmp: Remove xilinx_zynqmp_mini_emmc/qspi.h configs

[Michal Simek]

On 1/18/23 12:12, Michal Simek wrote:
> The commit eaf6ea6a1dc1 ("Migrate CUSTOM_SYS_INIT_SP_ADDR to Kconfig using
> system-constants.h") moved custom init stack pointer address to Kconfig
> which ends up in situation that xilinx_zynqmp_mini_emmc/qspi.h are not
> needed anymore. That's why remove files and move defconfigs directly to
> xilinx_zynqmp_mini.h configuration.
> 
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> ---
> 
>   configs/xilinx_zynqmp_mini_defconfig       |  2 +-
>   configs/xilinx_zynqmp_mini_emmc0_defconfig |  2 +-
>   configs/xilinx_zynqmp_mini_emmc1_defconfig |  2 +-
>   configs/xilinx_zynqmp_mini_qspi_defconfig  |  2 +-
>   include/configs/xilinx_zynqmp_mini_emmc.h  | 15 ---------------
>   include/configs/xilinx_zynqmp_mini_qspi.h  | 15 ---------------
>   6 files changed, 4 insertions(+), 34 deletions(-)
>   delete mode 100644 include/configs/xilinx_zynqmp_mini_emmc.h
>   delete mode 100644 include/configs/xilinx_zynqmp_mini_qspi.h
> 
> diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig
> index d8b3aab94f1f..9680d9b1c2f0 100644
> --- a/configs/xilinx_zynqmp_mini_defconfig
> +++ b/configs/xilinx_zynqmp_mini_defconfig
> @@ -1,5 +1,5 @@
>   CONFIG_ARM=y
> -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi"
> +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
>   CONFIG_SYS_ICACHE_OFF=y
>   CONFIG_ARCH_ZYNQMP=y
>   CONFIG_TEXT_BASE=0xFFFC0000
> diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig
> index a1ee98dfc252..93aaa9304b32 100644
> --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig
> +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig
> @@ -1,5 +1,5 @@
>   CONFIG_ARM=y
> -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc"
> +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
>   CONFIG_SYS_ICACHE_OFF=y
>   CONFIG_ARCH_ZYNQMP=y
>   CONFIG_TEXT_BASE=0x10000
> diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig
> index 88c95d4ce2a0..81ea67acedbe 100644
> --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig
> +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig
> @@ -1,5 +1,5 @@
>   CONFIG_ARM=y
> -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc"
> +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
>   CONFIG_SYS_ICACHE_OFF=y
>   CONFIG_ARCH_ZYNQMP=y
>   CONFIG_TEXT_BASE=0x10000
> diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
> index 7ef62dbcdab6..046cbcf30b60 100644
> --- a/configs/xilinx_zynqmp_mini_qspi_defconfig
> +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
> @@ -1,5 +1,5 @@
>   CONFIG_ARM=y
> -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi"
> +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
>   CONFIG_SYS_ICACHE_OFF=y
>   CONFIG_ARCH_ZYNQMP=y
>   CONFIG_TEXT_BASE=0xFFFC0000
> diff --git a/include/configs/xilinx_zynqmp_mini_emmc.h b/include/configs/xilinx_zynqmp_mini_emmc.h
> deleted file mode 100644
> index f423ddd08ec5..000000000000
> --- a/include/configs/xilinx_zynqmp_mini_emmc.h
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * Configuration for Xilinx ZynqMP eMMC Flash utility
> - *
> - * (C) Copyright 2018 Xilinx, Inc.
> - * Michal Simek <michal.simek at xilinx.com>
> - * Siva Durga Prasad Paladugu <sivadur at xilinx.com>
> - */
> -
> -#ifndef __CONFIG_ZYNQMP_MINI_EMMC_H
> -#define __CONFIG_ZYNQMP_MINI_EMMC_H
> -
> -#include <configs/xilinx_zynqmp_mini.h>
> -
> -#endif /* __CONFIG_ZYNQMP_MINI_EMMC_H */
> diff --git a/include/configs/xilinx_zynqmp_mini_qspi.h b/include/configs/xilinx_zynqmp_mini_qspi.h
> deleted file mode 100644
> index 5bea1c9908c7..000000000000
> --- a/include/configs/xilinx_zynqmp_mini_qspi.h
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * Configuration for Xilinx ZynqMP QSPI Flash utility
> - *
> - * (C) Copyright 2018 Xilinx, Inc.
> - * Michal Simek <michal.simek at xilinx.com>
> - * Siva Durga Prasad Paladugu <sivadur at xilinx.com>
> - */
> -
> -#ifndef __CONFIG_ZYNQMP_MINI_QSPI_H
> -#define __CONFIG_ZYNQMP_MINI_QSPI_H
> -
> -#include <configs/xilinx_zynqmp_mini.h>
> -
> -#endif /* __CONFIG_ZYNQMP_MINI_QSPI_H */


Applied.
M