diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-07 08:56:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-07 08:56:08 -0400 |
| commit | a6003397f7b74f7af6c21954073e046de08f43c9 (patch) | |
| tree | 49fd7e2356979bea9d9f4fffe1875ec02e5059b2 /include/configs/socfpga_common.h | |
| parent | a883f83e6d62fef1830b1634ccb72535c43696f7 (diff) | |
| parent | a7ed0ac2620b00c6eb85227f3c66bc169ad11f44 (diff) | |
Merge git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'include/configs/socfpga_common.h')
| -rw-r--r-- | include/configs/socfpga_common.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index c64c7ed420..38ae763653 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 |