From: Tom Rini <trini@konsulko.com>
Date: Thu, 16 Feb 2023 03:36:49 +0000 (-0500)
Subject: arm: zynq: Move to select'ing ARCH_EARLY_INIT_R if we have FPGA
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=d0bfa29cdcb4e68e88363e219c0310f7cfdfec6a;p=u-boot.git

arm: zynq: Move to select'ing ARCH_EARLY_INIT_R if we have FPGA

The function arch_early_init_r only does anything on these platforms if
we have FPGA (or SPL and SPL_FPGA) enabled, so move the logic to select
based on that.

Cc: Michal Simek <michal.simek@amd.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Michal Simek <michal.simek@amd.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 724cbdde25..c51f15fcf4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1209,6 +1209,7 @@ config ARCH_VF610
 config ARCH_ZYNQ
 	bool "Xilinx Zynq based platform"
 	select ARM_TWD_TIMER
+	select ARCH_EARLY_INIT_R if FPGA || (SPL && SPL_FPGA)
 	select CLK
 	select CLK_ZYNQ
 	select CPU_V7A
@@ -1230,7 +1231,6 @@ config ARCH_ZYNQ
 	select SPL_TIMER if SPL
 	select SUPPORT_SPL
 	select TIMER
-	imply ARCH_EARLY_INIT_R
 	imply BOARD_LATE_INIT
 	imply CMD_CLK
 	imply CMD_DM