diff options
| author | Michal Simek <[email protected]> | 2023-01-18 12:12:57 +0100 |
|---|---|---|
| committer | Michal Simek <[email protected]> | 2023-01-24 13:57:39 +0100 |
| commit | 36c9f4ad12f0d739fac32ff6162ad3f42edd2876 (patch) | |
| tree | e944b7679469040269b3d55f1e03d8d3fa9c28e8 | |
| parent | 988b3fa08da197e97363f4caff37a6568dfc07fc (diff) | |
arm64: zynqmp: Remove xilinx_zynqmp_mini_emmc/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_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 <[email protected]>
Link: https://lore.kernel.org/r/61ae40cf63aabd08adb386c870d3392b0b606fc9.1674040373.git.michal.simek@amd.com
| -rw-r--r-- | configs/xilinx_zynqmp_mini_defconfig | 2 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_mini_emmc0_defconfig | 2 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_mini_emmc1_defconfig | 2 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_mini_qspi_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/xilinx_zynqmp_mini_emmc.h | 15 | ||||
| -rw-r--r-- | include/configs/xilinx_zynqmp_mini_qspi.h | 15 |
6 files changed, 4 insertions, 34 deletions
diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig index d8b3aab94f1..9680d9b1c2f 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 a1ee98dfc25..93aaa9304b3 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 88c95d4ce2a..81ea67acedb 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 7ef62dbcdab..046cbcf30b6 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 f423ddd08ec..00000000000 --- 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 <[email protected]> - * Siva Durga Prasad Paladugu <[email protected]> - */ - -#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 5bea1c9908c..00000000000 --- 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 <[email protected]> - * Siva Durga Prasad Paladugu <[email protected]> - */ - -#ifndef __CONFIG_ZYNQMP_MINI_QSPI_H -#define __CONFIG_ZYNQMP_MINI_QSPI_H - -#include <configs/xilinx_zynqmp_mini.h> - -#endif /* __CONFIG_ZYNQMP_MINI_QSPI_H */ |