[U-Boot] [PATCH 2/2] arm: socfpga: Zap OF_CONTROL checks, it's always enabled
Marek Vasut
marex at denx.de
Wed Aug 19 23:23:53 CEST 2015
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 at 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
--
2.1.4
More information about the U-Boot
mailing list