diff options
| author | Michal Simek <michal.simek@amd.com> | 2023-01-18 14:26:43 +0300 |
|---|---|---|
| committer | Michal Simek <michal.simek@amd.com> | 2023-01-24 15:58:14 +0300 |
| commit | 00ce57e4b948c07095dada9704ef05a60e4b4bff (patch) | |
| tree | a747c0eba8287fd767b81e895f6deb87e99e2d68 | |
| parent | 36c9f4ad12f0d739fac32ff6162ad3f42edd2876 (diff) | |
| download | u-boot-00ce57e4b948c07095dada9704ef05a60e4b4bff.tar.xz | |
arm64: versal: Remove xilinx_versal_mini_qspi.h configs
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_versal_mini_qspi.h is not
needed anymore. That's why remove the file and move defconfigs directly to
xilinx_versal_mini.h configuration.
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/2d7276ab8d4cb1d245b64287fb59c79325513f22.1674041200.git.michal.simek@amd.com
| -rw-r--r-- | configs/xilinx_versal_mini_defconfig | 2 | ||||
| -rw-r--r-- | configs/xilinx_versal_mini_ospi_defconfig | 2 | ||||
| -rw-r--r-- | configs/xilinx_versal_mini_qspi_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/xilinx_versal_mini_qspi.h | 15 |
4 files changed, 3 insertions, 18 deletions
diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig index 3c5ab01aa9..463aee410e 100644 --- a/configs/xilinx_versal_mini_defconfig +++ b/configs/xilinx_versal_mini_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini_qspi" +CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini" CONFIG_SYS_ICACHE_OFF=y CONFIG_COUNTER_FREQUENCY=100000000 CONFIG_ARCH_VERSAL=y diff --git a/configs/xilinx_versal_mini_ospi_defconfig b/configs/xilinx_versal_mini_ospi_defconfig index abcd20ba85..f9fdf61747 100644 --- a/configs/xilinx_versal_mini_ospi_defconfig +++ b/configs/xilinx_versal_mini_ospi_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini_qspi" +CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini" CONFIG_COUNTER_FREQUENCY=100000000 CONFIG_ARCH_VERSAL=y CONFIG_TEXT_BASE=0xFFFC0000 diff --git a/configs/xilinx_versal_mini_qspi_defconfig b/configs/xilinx_versal_mini_qspi_defconfig index 11aff80f14..9fc3eb69e7 100644 --- a/configs/xilinx_versal_mini_qspi_defconfig +++ b/configs/xilinx_versal_mini_qspi_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini_qspi" +CONFIG_SYS_CONFIG_NAME="xilinx_versal_mini" CONFIG_COUNTER_FREQUENCY=100000000 CONFIG_ARCH_VERSAL=y CONFIG_TEXT_BASE=0xFFFC0000 diff --git a/include/configs/xilinx_versal_mini_qspi.h b/include/configs/xilinx_versal_mini_qspi.h deleted file mode 100644 index e2f2df2935..0000000000 --- a/include/configs/xilinx_versal_mini_qspi.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Configuration for Xilinx Versal QSPI Flash utility - * - * (C) Copyright 2018-2019 Xilinx, Inc. - * Michal Simek <michal.simek@xilinx.com> - * Siva Durga Prasad Paladugu <sivadur@xilinx.com> - */ - -#ifndef __CONFIG_VERSAL_MINI_QSPI_H -#define __CONFIG_VERSAL_MINI_QSPI_H - -#include <configs/xilinx_versal_mini.h> - -#endif /* __CONFIG_VERSAL_MINI_QSPI_H */ |