diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2020-08-27 16:34:11 +0300 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2020-09-23 11:31:40 +0300 |
| commit | 6ba36c0e5910a1cc8b527403bf1a80db320f1315 (patch) | |
| tree | d548ee896f8b32603ee6ef31a61ad9a725a96831 | |
| parent | 54fdef242fdcda8792b7c05d687dc79a624fcc32 (diff) | |
| download | u-boot-6ba36c0e5910a1cc8b527403bf1a80db320f1315.tar.xz | |
xilinx: kconfig: Move sourcing of board Kconfig to mach folders
Do not source xilinx board Kconfig by other boards. These configs should be
available only when Xilinx platforms are selected.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-versal/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-zynqmp/Kconfig | 3 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_mini_qspi_defconfig | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 67286e8b5d..21c43fa0b7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1997,10 +1997,6 @@ source "board/tcl/sl50/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/variscite/dart_6ul/Kconfig" source "board/vscom/baltos/Kconfig" -source "board/xilinx/Kconfig" -source "board/xilinx/zynq/Kconfig" -source "board/xilinx/zynqmp/Kconfig" -source "board/xilinx/versal/Kconfig" source "board/phytium/durian/Kconfig" source "board/xen/xenguest_arm64/Kconfig" diff --git a/arch/arm/mach-versal/Kconfig b/arch/arm/mach-versal/Kconfig index e1d66e8d32..ebd2da3887 100644 --- a/arch/arm/mach-versal/Kconfig +++ b/arch/arm/mach-versal/Kconfig @@ -62,4 +62,7 @@ config VERSAL_NO_DDR This option configures MMU with no DDR to avoid speculative access to DDR memory where DDR is not present. +source "board/xilinx/Kconfig" +source "board/xilinx/versal/Kconfig" + endif diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 79f831e6df..e54310383b 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -70,4 +70,7 @@ config BOOT_INIT_FILE config ZYNQ_SDHCI_MAX_FREQ default 52000000 +source "board/xilinx/Kconfig" +source "board/xilinx/zynq/Kconfig" + endif diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig index d82a737a69..f1301f6661 100644 --- a/arch/arm/mach-zynqmp/Kconfig +++ b/arch/arm/mach-zynqmp/Kconfig @@ -171,4 +171,7 @@ config SD1_LSHFT_MODE endchoice +source "board/xilinx/Kconfig" +source "board/xilinx/zynqmp/Kconfig" + endif diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 706e7980f9..23a690aa3d 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -8,8 +8,8 @@ CONFIG_ENV_SIZE=0x80 CONFIG_SPL=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_ZYNQMP_NO_DDR=y -# CONFIG_PSCI_RESET is not set # CONFIG_CMD_ZYNQMP is not set +# CONFIG_PSCI_RESET is not set CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi" # CONFIG_EXPERT is not set # CONFIG_LEGACY_IMAGE_FORMAT is not set |