From 00ce57e4b948c07095dada9704ef05a60e4b4bff Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 18 Jan 2023 12:26:43 +0100 Subject: [PATCH] =?utf8?q?arm64:=C2=A0versal:=C2=A0Remove=C2=A0xilinx=5Fve?= =?utf8?q?rsal=5Fmini=5Fqspi.h=C2=A0configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Link: https://lore.kernel.org/r/2d7276ab8d4cb1d245b64287fb59c79325513f22.1674041200.git.michal.simek@amd.com --- configs/xilinx_versal_mini_defconfig | 2 +- configs/xilinx_versal_mini_ospi_defconfig | 2 +- configs/xilinx_versal_mini_qspi_defconfig | 2 +- include/configs/xilinx_versal_mini_qspi.h | 15 --------------- 4 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 include/configs/xilinx_versal_mini_qspi.h diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig index 3c5ab01..463aee4 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 abcd20b..f9fdf61 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 11aff80..9fc3eb6 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 e2f2df2..0000000 --- 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 - * Siva Durga Prasad Paladugu - */ - -#ifndef __CONFIG_VERSAL_MINI_QSPI_H -#define __CONFIG_VERSAL_MINI_QSPI_H - -#include - -#endif /* __CONFIG_VERSAL_MINI_QSPI_H */ -- 2.7.4