[U-Boot] [PATCH 1/2] arm: socfpga: Always enable OF_CONTROL and SPL_OF_CONTROL
The SoCFPGA probes mostly from OF and the OF is mandatory both in U-Boot itself and U-Boot SPL. Enable it by default.
Signed-off-by: Marek Vasut marex@denx.de --- arch/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a99ae28..1f5dafa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -639,6 +639,8 @@ config ARCH_SOCFPGA bool "Altera SOCFPGA family" select CPU_V7 select SUPPORT_SPL + select OF_CONTROL + select SPL_OF_CONTROL select DM select DM_SPI_FLASH select DM_SPI
The CONFIG_OF_CONTROL and CONFIG_SPL_OF_CONTROL is always enabled on Altera SoCFPGA, remove the unnecessary checks.
Signed-off-by: Marek Vasut marex@denx.de --- include/configs/socfpga_common.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 07956f0..d170bb9 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -192,7 +192,6 @@ unsigned int cm_get_l4_sp_clk_hz(void); /* * QSPI support */ -#ifdef CONFIG_OF_CONTROL /* QSPI is controlled via DT */ #define CONFIG_CADENCE_QSPI /* Enable multiple SPI NOR flash manufacturers */ #define CONFIG_SPI_FLASH_STMICRO /* Micron/Numonyx flash */ @@ -212,12 +211,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_CQSPI_DECODER 0 #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH_BAR -#endif
-#if CONFIG_IS_ENABLED(OF_CONTROL) /* DW SPI is controlled via DT */ +/* + * Designware SPI support + */ #define CONFIG_DESIGNWARE_SPI #define CONFIG_CMD_SPI -#endif
/* * Serial Driver
On Wednesday, August 19, 2015 at 11:23:53 PM, Marek Vasut wrote:
The CONFIG_OF_CONTROL and CONFIG_SPL_OF_CONTROL is always enabled on Altera SoCFPGA, remove the unnecessary checks.
Signed-off-by: Marek Vasut marex@denx.de
Since this fixes an actual issue, applied.
Best regards, Marek Vasut
participants (1)
-
Marek Vasut